Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2629,7 +2629,11 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             // 注册专区直接算等级
             bdGrade = this.getGradeByBox(boxNum, gradeList, null, true);
             // 特殊等级处理
-            this.handleGradeEnd(gradeList, bdGrade);
+            BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade);
+            if (null != isPay && EYesNo.YES.getIntValue() == isPay) {
+                // 支付时才进行处理
+                bdGrade = tmpGrade;
+            }
         } else if (ESpecialArea.RETAIL_UPGRADE.getValue() == specialArea) {
             // 升级专区，一次性补差升级
             if (boxNum == 0) {