From a084080a6cef6ee0bb4e564e9a9fcc4ed4f4fa06 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 16 Apr 2025 17:54:01 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=A4=8D=E8=B4=AD=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A5=96=E8=A1=94=E4=BB=B7=E6=A0=BC=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BdWaresSpecsSkuServiceImpl.java      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
index 8ac4c634..b43713cd 100644
--- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
+++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
@@ -84,11 +84,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
             int level = cuMember.getPkSettleGrade();
             int rangeType = ERangeType.GRADE.getValue();
-            BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
-            if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
-                level = cuMember.getPkAwards();
-                rangeType = ERangeType.AWARDS.getValue();
-            }
+//            BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+//            if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
+//                level = cuMember.getPkAwards();
+//                rangeType = ERangeType.AWARDS.getValue();
+//            }
             RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
             if (rangeDTO == null) {
                 return new CuWaresParams();
@@ -301,11 +301,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
             int level = cuMember.getPkSettleGrade();
             int rangeType = ERangeType.GRADE.getValue();
-            BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
-            if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
-                level = cuMember.getPkAwards();
-                rangeType = ERangeType.AWARDS.getValue();
-            }
+//            BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+//            if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
+//                level = cuMember.getPkAwards();
+//                rangeType = ERangeType.AWARDS.getValue();
+//            }
             RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
             if (rangeDTO == null) {
                 return new CuWaresParams();
@@ -533,11 +533,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
                 CuMember cuMember = saOrderService.getCuMemberByKey(pkMember);
                 int level = cuMember.getPkSettleGrade();
                 int rangeType = ERangeType.GRADE.getValue();
-                BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
-                if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
-                    level = cuMember.getPkAwards();
-                    rangeType = ERangeType.AWARDS.getValue();
-                }
+//                BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+//                if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
+//                    level = cuMember.getPkAwards();
+//                    rangeType = ERangeType.AWARDS.getValue();
+//                }
                 List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList());
                 List<BdWaresRange> bdWaresRangeList = bdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
                 bdWaresRangeList.forEach(bdWaresRange -> {