feat(order): 添加供应商类型筛选和订单成本筛选功能

- 在OrderSupplierPageQry中新增供应商类型字段支持筛选
- 优化订单网关中的布尔值比较逻辑
- 为返利订单查询添加金额大于0的条件过滤
- 在订单成本查询中增加价格大于0的筛选条件
- 实现供应商类型在查询中的动态条件支持

erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java

@@ -944,7 +944,8 @@ public class OrderGatewayImpl implements OrderGateway {
 
 		DealerDO dealerDO = dealerMapper.selectById(lastVehicleNoQry.getDealerId());
 
-		if (dealerDO.getSetting().getEnableInitialTrainNo()) {
+		Boolean enableInitialTrainNo = dealerDO.getSetting().getEnableInitialTrainNo();
+		if (enableInitialTrainNo.equals(Boolean.TRUE)) {
 			return dealerDO.getSetting().getInitialTrainNo().toString();
 		} else {
 			return "0";

erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderRebateGatewayImpl.java

@@ -44,6 +44,7 @@ public class OrderRebateGatewayImpl implements OrderRebateGateway {
 	public IPage<OrderRebate> page(OrderRebatePageQry orderRebatePageQry) {
 		LambdaQueryWrapper<OrderRebateDO> queryWrapper = Wrappers.lambdaQuery(OrderRebateDO.class);
 		queryWrapper.eq(Objects.nonNull(orderRebatePageQry.getIsPaid()), OrderRebateDO::getIsPaid, orderRebatePageQry.getIsPaid());
+		queryWrapper.gt(OrderRebateDO::getAmount, 0);
 
 		queryWrapper.orderByDesc(OrderRebateDO::getCreatedAt);
 

erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml

@@ -58,7 +58,7 @@
 		LEFT JOIN `order` po ON oc.order_id = po.order_id AND
 		po.is_delete = 0
 		<where>
-			oc.is_delete = 0
+			oc.is_delete = 0 and oc.price > 0
 			<if test="query.createdBy != null">
 				AND po.created_by = #{query.createdBy}
 			</if>

erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml

@@ -69,6 +69,9 @@
 			<if test="query.createdBy != null">
 				AND po.created_by = #{query.createdBy}
 			</if>
+			<if test="query.type != null">
+				AND os.type = #{query.type}
+			</if>
 			<if test="query.orderId != null">
 				AND po.order_id = #{query.orderId}
 			</if>

erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java

@@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry;
 
 import com.xunhong.erp.turbo.api.biz.dto.enums.OrderStateEnum;
 import com.xunhong.erp.turbo.api.biz.dto.enums.OrderTypeEnum;
+import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum;
 import com.xunhong.erp.turbo.base.dto.PageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -43,5 +44,11 @@ public class OrderSupplierPageQry extends PageQuery {
 
 	@Schema(title = "是否支付", type = "boolean")
 	private Boolean isPaid;
+
+	/**
+	 * 供应商类型：1_瓜农；2_自家档口；3_其他家档口
+	 */
+	@Schema(title = "供应商类型：1_瓜农；2_自家档口；3_其他家档口")
+	private SupplierTypeEnum type;
 }