From 2bb0369e00a9568ef249f2c1d3a2b0a6118e7517 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 21 Oct 2025 13:42:00 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8A=A0=E8=B4=AD=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../add/mapper/AcAddUpgradeConfigMapper.java | 12 +---- .../impl/AcAddUpgradeConfigServiceImpl.java | 40 ++++++++++----- .../activity/add/AcAddUpgradeConfigMapper.xml | 50 +++++-------------- .../add/ext/AcAddUpgradeConfigExt.java | 5 ++ 4 files changed, 46 insertions(+), 61 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java index fda3a770..a5a6bac2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java @@ -33,15 +33,7 @@ public interface AcAddUpgradeConfigMapper extends BaseMapper /** * 查询符合条件的规则 */ - AcAddUpgradeConfigExt getUpgradeConfig(@Param("orderType") Integer orderType, - @Param("waresCodeList") List waresCodeList, - @Param("pkGrade") Integer pkGrade); - - /** - * 查询符合条件的规则 - */ - AcAddUpgradeConfigExt getUpgradeConfigByPkWares(@Param("orderType") Integer orderType, - @Param("pkWaresList") List pkWaresList, - @Param("pkGrade") Integer pkGrade); + List getUpgradeConfig(@Param("orderType") Integer orderType, + @Param("pkGrade") Integer pkGrade); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java index 938de98e..f31d59d0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java @@ -193,11 +193,18 @@ public class AcAddUpgradeConfigServiceImpl extends ServiceImpl waresCodeList = orderItemsParams.stream().map(OrderItemsParam::getWaresCode).collect(Collectors.toList()); - AcAddUpgradeConfigExt configExt = baseMapper.getUpgradeConfig(orderParam.getSpecialArea(), waresCodeList, orderReturn.getPkGradeTmp()); - if (null != configExt) { - orderReturn.setPkGradeVal(configExt.getGradeName()); + List configExtList = baseMapper.getUpgradeConfig(orderParam.getSpecialArea(), orderReturn.getPkGradeTmp()); + if (CollectionUtil.isNotEmpty(configExtList)) { + for (AcAddUpgradeConfigExt configExt : configExtList) { + for (OrderItemsParam orderItemsParam : orderItemsParams) { + if (orderItemsParam.getWaresCode().equals(configExt.getWaresCode()) + && orderItemsParam.getQuantity() >= configExt.getQuantity()) { + orderReturn.setPkGradeVal(configExt.getGradeName()); + return; + } + } + } } } @@ -206,15 +213,22 @@ public class AcAddUpgradeConfigServiceImpl extends ServiceImpl pkWaresList = orderItemsList.stream().map(SaOrderItems::getPkWares).collect(Collectors.toList()); - AcAddUpgradeConfigExt configExt = baseMapper.getUpgradeConfigByPkWares(specialArea, pkWaresList, pkGrade); - if (null != configExt) { - return GradeDTO.builder() - .pkId(configExt.getUpgradeLevel()) - .gradeName(configExt.getGradeName()) - .pkAwards(configExt.getPkAwards()) - .registerAuthority(configExt.getRegisterAuthority()) - .build(); + + List configExtList = baseMapper.getUpgradeConfig(specialArea, pkGrade); + if (CollectionUtil.isNotEmpty(configExtList)) { + for (AcAddUpgradeConfigExt configExt : configExtList) { + for (SaOrderItems orderItemsParam : orderItemsList) { + if (orderItemsParam.getPkWares().equals(configExt.getPkWares()) + && orderItemsParam.getWaresQuantity() >= configExt.getQuantity()) { + return GradeDTO.builder() + .pkId(configExt.getUpgradeLevel()) + .gradeName(configExt.getGradeName()) + .pkAwards(configExt.getPkAwards()) + .registerAuthority(configExt.getRegisterAuthority()) + .build(); + } + } + } } return null; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml index 5e0dd3cc..f6bba2c9 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml @@ -97,12 +97,19 @@ - - diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/ext/AcAddUpgradeConfigExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/ext/AcAddUpgradeConfigExt.java index 092e3488..014a0ed0 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/ext/AcAddUpgradeConfigExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/add/ext/AcAddUpgradeConfigExt.java @@ -25,4 +25,9 @@ public class AcAddUpgradeConfigExt extends AcAddUpgradeConfig { */ private Integer registerAuthority; + /** + * 商品编号 + */ + private String waresCode; + }