From 60400f5399ba4d7b0b8899c3337c843fe5341e86 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Mon, 27 Oct 2025 14:44:55 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=8D=95=E7=AC=94PV=E5=A4=A7?=
 =?UTF-8?q?=E4=BA=8E20000=E7=BB=99=E9=87=91=E7=89=8C,=E5=A4=A7=E4=BA=8E100?=
 =?UTF-8?q?00=E7=BB=99=E9=93=B6=E7=89=8C.(=E5=8F=AA=E5=A4=84=E7=90=8641/42?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=AE=A2=E5=8D=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RetailOrderServiceImpl.java  | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 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 26785baf..5d53691e 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
@@ -677,33 +677,35 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
         return resultStr;
     }
     public void processMemberLevel(CuMember gradeMember, SaOrderExt saOrderExt){
-        // 处理等级
-        GradeDTO bdGrade = iGradeServiceApi.getGrade(gradeMember.getPkSettleGrade()).getData();
-        List<BdGrade> gradeDTOList = iGradeServiceApi.getRetailGradeList().getData();
-        CuMemberLevel memberLevel = null;
-        if(bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()){
-            if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.GOLD_CARD_PV) >= 0){
-                // 拿金牌等级
-                BdGrade goldGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.YOU_KE.getValue())).findFirst().get();
-                memberLevel = getCuMemberLevel(gradeMember, saOrderExt, goldGrade.getPkId());
-                gradeMember.setPkSettleGrade(goldGrade.getPkId());
-                gradeMember.setPkSettleGradeValue(goldGrade.getGradeValue());
-            }else if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.SILVER_CARD_PV) >= 0){
-                // 拿银牌等级
-                BdGrade silverGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.HAI_FAN.getValue())).findFirst().get();
-                memberLevel = getCuMemberLevel(gradeMember, saOrderExt, silverGrade.getPkId());
-                gradeMember.setPkSettleGrade(silverGrade.getPkId());
-                gradeMember.setPkSettleGradeValue(silverGrade.getGradeValue());
+        if(EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()){
+            // 处理等级
+            GradeDTO bdGrade = iGradeServiceApi.getGrade(gradeMember.getPkSettleGrade()).getData();
+            List<BdGrade> gradeDTOList = iGradeServiceApi.getRetailGradeList().getData();
+            CuMemberLevel memberLevel = null;
+            if(bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()){
+                if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.GOLD_CARD_PV) >= 0){
+                    // 拿金牌等级
+                    BdGrade goldGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.YOU_KE.getValue())).findFirst().get();
+                    memberLevel = getCuMemberLevel(gradeMember, saOrderExt, goldGrade.getPkId());
+                    gradeMember.setPkSettleGrade(goldGrade.getPkId());
+                    gradeMember.setPkSettleGradeValue(goldGrade.getGradeValue());
+                }else if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.SILVER_CARD_PV) >= 0){
+                    // 拿银牌等级
+                    BdGrade silverGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.HAI_FAN.getValue())).findFirst().get();
+                    memberLevel = getCuMemberLevel(gradeMember, saOrderExt, silverGrade.getPkId());
+                    gradeMember.setPkSettleGrade(silverGrade.getPkId());
+                    gradeMember.setPkSettleGradeValue(silverGrade.getGradeValue());
+                }
             }
-        }
-        if(ObjectUtil.isNotEmpty(memberLevel)){
-            Boolean saveMemberLevelFlag = iMemberServiceApi.saveMemberLevel(memberLevel).getData();
-            if(!saveMemberLevelFlag){
-                throw new ServiceException("记录用户升级信息异常!");
-            }
-            Boolean saveMemberFlag = iMemberServiceApi.saveMember(gradeMember).getData();
-            if(!saveMemberFlag){
-                throw new ServiceException("更新用户结算等级异常!");
+            if(ObjectUtil.isNotEmpty(memberLevel)){
+                Boolean saveMemberLevelFlag = iMemberServiceApi.saveMemberLevel(memberLevel).getData();
+                if(!saveMemberLevelFlag){
+                    throw new ServiceException("记录用户升级信息异常!");
+                }
+                Boolean saveMemberFlag = iMemberServiceApi.saveMember(gradeMember).getData();
+                if(!saveMemberFlag){
+                    throw new ServiceException("更新用户结算等级异常!");
+                }
             }
         }
     }