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

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

@@ -2657,6 +2657,13 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             // 计算等级
             bdGrade = this.getGradeByBox(boxNum + baseBoxNum, gradeList, memberGrade, true);
 
+            if (bdGrade.getGradeValue().equals(memberGrade.getGradeValue())
+                    && (EGrade.HAI_FAN.getValue() == bdGrade.getGradeValue() || EGrade.YOU_KE.getValue() == bdGrade.getGradeValue())
+            ) {
+                // 旧等级与新等级相同 并且 旧等级为V1或V2
+                return null;
+            }
+
             // 特殊等级处理
             BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade);
             if (null != isPay && EYesNo.YES.getIntValue() == isPay) {