## 撤单重消订单推送秒结处理；

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java

@@ -719,8 +719,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             }
             // 封装会员信息
             CuMember newMember = this.packageCuMember(registerParam);
-            newMember.setPkSettleGrade(registerParam.getPkGrade());
+            BdGrade tmpGrade = iSaOrderService.handleGradeEnd(null, registerParam.getPkGrade());
-            newMember.setPkAwards(registerParam.getPkAwards());
+            newMember.setPkSettleGrade(tmpGrade.getPkId());
+            newMember.setPkAwards(tmpGrade.getPkAwards());
 
             saOrderExt.setPkMember(newMember.getPkId());
 
@@ -734,7 +735,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             }
             if (EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) {
                 // 升级订单
-                cuMember.setPkSettleGrade(saOrderExt.getPkGrade());
+                BdGrade tmpGrade = iSaOrderService.handleGradeEnd(null, saOrderExt.getPkGrade());
+                cuMember.setPkSettleGrade(tmpGrade.getPkId());
                 resultStr = this.payUpgOrder(saOrderExt, cuMember, null);
             } else {
                 // 其它订单

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java

@@ -642,4 +642,12 @@ public interface ISaOrderService extends IService<SaOrder> {
                            List<BdGrade> gradeList, CuMember updateGradeMember,
                            Integer systemType, Integer isPay);
 
+    /**
+     * 处理最终等级（多送2级）
+     * @param gradeList
+     * @param pkGrade
+     * @return
+     */
+    BdGrade handleGradeEnd(List<BdGrade> gradeList, Integer pkGrade);
+
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java

@@ -2461,7 +2461,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
         try {
             if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType()
                     || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()
-                    || EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) {
+                    || EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()
+                    || EOrderType.RETAIL_CONSUME.getValue() == saOrderExt.getOrderType()) {
                 // 撤单标记为 true
                 saOrderExt.setCancelBool(Boolean.TRUE);
                 // 计算奖金，通过mq分发消息，异步处理
@@ -2503,7 +2504,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             // 注册专区直接算等级
             bdGrade = this.getGradeByBox(boxNum, gradeList, null, true);
             // 特殊等级处理
-            BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade);
+            BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade.getPkId());
             if (null != isPay && EYesNo.YES.getIntValue() == isPay) {
                 // 支付时才进行处理
                 bdGrade = tmpGrade;
@@ -2539,7 +2540,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             }
 
             // 特殊等级处理
-            BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade);
+            BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade.getPkId());
             if (null != isPay && EYesNo.YES.getIntValue() == isPay) {
                 // 支付时才进行处理
                 bdGrade = tmpGrade;
@@ -3383,13 +3384,16 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
      * new 2025.06.25 V1-V3升级多送两级处理
      *
      * @param gradeList
-     * @param bdGrade
+     * @param pkGrade
      * @return
      */
-    private BdGrade handleGradeEnd(List<BdGrade> gradeList, BdGrade bdGrade) {
+    @Override
+    public BdGrade handleGradeEnd(List<BdGrade> gradeList, Integer pkGrade) {
+        if (CollectionUtil.isEmpty(gradeList)) {
+            gradeList = iGradeServiceApi.getRetailGradeList().getData();
+        }
         // new 2025.06.14 添加新需求，V1-V3，购买多给两级
         // new 2025.06.25 V1-V3升级多送两级，可以继续购买升级
-        Integer pkGrade = bdGrade.getPkId();
         // 临时处理等级
         BdGrade tmpGrade = gradeList.stream().filter(tmpData -> tmpData.getPkId().equals(pkGrade)).findFirst().get();