From 248236442cf26dee1c69ef4a4c2395f323987465 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 29 Oct 2025 10:50:56 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E7=BA=A7=E5=B7=AE?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RetailOrderServiceImpl.java  |  3 +-
 .../impl/BdWaresSpecsSkuServiceImpl.java      | 35 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
index f26edce9..df4be0de 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
@@ -360,7 +360,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
         if (CollectionUtil.isNotEmpty(orderItemsParams)) {
             List<BdWaresDetailExt> waresDetailExtList = iBdWaresDetailService.queryWaresDetailByCondition(specialArea, ETransportType.LAND.getValue(), orderItemsParams, systemType);
             // 复购处理极差
-            setWaresRange(specialArea, waresDetailExtList, cuMember);
+            // 2025.10.29 去掉级差处理，目前没有级差价格
+//            setWaresRange(specialArea, waresDetailExtList, cuMember);
             if (waresDetailExtList.size() > 0) {
                 bdWaresDetailExtList.addAll(waresDetailExtList);
             }
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
index 34a5304a..d5dc69a6 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
@@ -422,23 +422,24 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
                 waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ","));
             });
 
-            if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea
-                    || EOrderType.RETAIL_CONSUME.getValue() == specialArea) {
-                // 2024.12.30 添加需求，复消也需要处理级差
-                CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember);
-                int level = cuMember.getPkSettleGrade();
-                int rangeType = ERangeType.GRADE.getValue();
-                List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList());
-                List<BdWaresRange> bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
-                bdWaresRangeList.forEach(bdWaresRange -> {
-                    String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku();
-                    if (waresDetailExtMap.containsKey(key)) {
-                        waresDetailExtMap.get(key).setPrice(bdWaresRange.getPrice());
-                        waresDetailExtMap.get(key).setAchieve(bdWaresRange.getAchieve());
-                        waresDetailExtMap.get(key).setAssAchieve(bdWaresRange.getAssAchieve());
-                    }
-                });
-            }
+            // 2025.10.29 去掉级差处理，目前没有级差价格
+//            if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea
+//                    || EOrderType.RETAIL_CONSUME.getValue() == specialArea) {
+//                // 2024.12.30 添加需求，复消也需要处理级差
+//                CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember);
+//                int level = cuMember.getPkSettleGrade();
+//                int rangeType = ERangeType.GRADE.getValue();
+//                List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList());
+//                List<BdWaresRange> bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
+//                bdWaresRangeList.forEach(bdWaresRange -> {
+//                    String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku();
+//                    if (waresDetailExtMap.containsKey(key)) {
+//                        waresDetailExtMap.get(key).setPrice(bdWaresRange.getPrice());
+//                        waresDetailExtMap.get(key).setAchieve(bdWaresRange.getAchieve());
+//                        waresDetailExtMap.get(key).setAssAchieve(bdWaresRange.getAssAchieve());
+//                    }
+//                });
+//            }
 
             for (WaresItemWaresInfo waresItemWaresInfo : waresItemVo.getWaresItemsParamList()) {
                 waresItemVo.setPrice(ComputeUtil.computeAdd(waresItemVo.getPrice(), ComputeUtil.computeMultiply(waresItemWaresInfo.getPrice(), waresItemWaresInfo.getQuantity())));