From 9ed8555c1058c6df255676b726f83a0ba7a87832 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 21 Aug 2025 10:15:11 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=8D=87=E7=BA=A7=E4=B8=93=E5=8C=BA?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5=E5=8D=87=E7=BA=A7=E5=88=B0?=
 =?UTF-8?q?=E8=91=A3=E4=BA=8B=E4=BB=A3=E7=90=86=EF=BC=8C=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SaOrderServiceImpl.java      | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index 09930e71..25a3aee0 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -2201,23 +2201,10 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                     .max(Comparator.comparingInt(BdGrade::getGradeValue)).get();
         } else {
             // 非注册处理
-//            if (checkUpgrade) {
-//                // 当前等级大于等于V3 或 盒数商品为0，则直接返回当前等级
-//                if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0
-//                        || boxTotal == 0) {
-//                    return memberGrade;
-//                }
-//            } else {
-//                // 当前等级大于V3 或 盒数商品为0，则直接返回当前等级
-//                if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) > 0
-//                        || boxTotal == 0) {
-//                    return memberGrade;
-//                }
-//            }
-
             // 查询等级比现在当前等级大的  并且 排除高级店主，然后倒序排序，再查询 购买盒数 <= 等级盒数 的第一个等级，就是当前升级的等级
             Optional<BdGrade> gradeOptional = gradeList.stream()
-                    .filter(tmpGrade -> tmpGrade.getGradeValue() != EGrade.S_VIP.getValue() && tmpGrade.getGradeValue() > memberGrade.getGradeValue())
+                    .filter(tmpGrade -> tmpGrade.getGradeValue() != EGrade.S_VIP.getValue() && tmpGrade.getGradeValue() != EGrade.DIRECTOR.getValue()
+                            && tmpGrade.getGradeValue() > memberGrade.getGradeValue())
                     .sorted(Comparator.comparingInt(BdGrade::getGradeValue).reversed())
                     .filter(tmpGrade -> tmpGrade.getBoxNumber().compareTo(BigDecimal.ZERO) > 0)
                     .filter(tmpGrade -> tmpGrade.getBoxNumber().compareTo(boxTotal) <= 0).findFirst();
@@ -2238,7 +2225,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
      */
     @Override
     public BigDecimal handleBaseBoxNum(CuMember cuMember, BdGrade memberGrade, List<BdGrade> gradeList, List<String> boxWaresList,
-                                Integer systemType) {
+                                       Integer systemType) {
         // 升级盒数基数
         BigDecimal baseBoxNum = BigDecimal.ZERO;
         // 会员所有升级记录