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

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

@@ -302,6 +302,12 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             gradeList = iGradeServiceApi.getRetailGradeList().getData();
         }
 
+        BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get();
+        if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) {
+            // 最高级，直接返回
+            return bdGrade;
+        }
+
         // 订单业绩
         if (null == orderAchieve) {
             orderAchieve = BigDecimal.ZERO;