From 3bf75a5fb64cde198f2b9bfe291fb6a1c8d47791 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 18 Sep 2025 11:30:32 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E6=B3=A8=E5=86=8C=E5=A5=96?=
 =?UTF-8?q?=E8=A1=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RetailOrderServiceImpl.java  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 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 6776a5ad..37ebf6eb 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
@@ -205,17 +205,18 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             // 会员信息
             if (null != cuMember) {
                 cuMember.setPkSettleGrade(newGrade.getPkId());
-                if (null == cuMember.getPkAwards()) {
-                    // 新会员没有奖衔，则进行赋值
-                    cuMember.setPkAwards(newGrade.getPkAwards());
-                } else {
-                    // 老会员奖衔如果为无，也进行赋值
-                    BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
-                    if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()
-                            && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) {
-                        cuMember.setPkAwards(newGrade.getPkAwards());
-                    }
-                }
+                cuMember.setPkAwards(newGrade.getPkAwards());
+//                if (null == cuMember.getPkAwards()) {
+//                    // 新会员没有奖衔，则进行赋值
+//                    cuMember.setPkAwards(newGrade.getPkAwards());
+//                } else {
+//                    // 老会员奖衔如果为无，也进行赋值
+//                    BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+//                    if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()
+//                            && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) {
+//                        cuMember.setPkAwards(newGrade.getPkAwards());
+//                    }
+//                }
             }
         }else if(ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()){
 //            saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().add(orderParam.getPostage()));