From 88b5994fb4a9d1058c89ec8951de274daaa44020 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Mon, 29 Dec 2025 15:25:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E5=92=8C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=88=90=E6=9C=AC=E7=AD=9B=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在OrderSupplierPageQry中新增供应商类型字段支持筛选 - 优化订单网关中的布尔值比较逻辑 - 为返利订单查询添加金额大于0的条件过滤 - 在订单成本查询中增加价格大于0的筛选条件 - 实现供应商类型在查询中的动态条件支持 --- .../turbo/biz/infrastructure/gateway/OrderGatewayImpl.java | 3 ++- .../biz/infrastructure/gateway/OrderRebateGatewayImpl.java | 1 + .../src/main/resources/mapper/OrderCostMapper.xml | 2 +- .../src/main/resources/mapper/OrderSupplierMapper.xml | 3 +++ .../erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java | 7 +++++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java index 7a10dd9..6b9cca7 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java +++ b/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"; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderRebateGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderRebateGatewayImpl.java index be0e396..53851a5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderRebateGatewayImpl.java +++ b/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 page(OrderRebatePageQry orderRebatePageQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(OrderRebateDO.class); queryWrapper.eq(Objects.nonNull(orderRebatePageQry.getIsPaid()), OrderRebateDO::getIsPaid, orderRebatePageQry.getIsPaid()); + queryWrapper.gt(OrderRebateDO::getAmount, 0); queryWrapper.orderByDesc(OrderRebateDO::getCreatedAt); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml index 7e8f809..bbe2172 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml +++ b/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 - oc.is_delete = 0 + oc.is_delete = 0 and oc.price > 0 AND po.created_by = #{query.createdBy} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml index cf808b6..579cf92 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml @@ -69,6 +69,9 @@ AND po.created_by = #{query.createdBy} + + AND os.type = #{query.type} + AND po.order_id = #{query.orderId} diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java index 7ae1c57..5c3474b 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java +++ b/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; }