From 58f32eb5466182868f805d22d571ab9ba1661031 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 18 Aug 2025 16:08:07 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E9=9B=A8=E6=B1=90=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BA=E7=B4=AF=E8=AE=A1=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/service/impl/SaOrderServiceImpl.java  |  8 +++++++-
 .../mapper/sale/order/SaOrderItemsMapper.xml         | 12 +-----------
 .../hzs/common/core/constant/RetailConstants.java    |  2 +-
 3 files changed, 9 insertions(+), 13 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 98f77dd8..1dffb0c4 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
@@ -2394,6 +2394,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             }
         } else if (ESpecialArea.RETAIL_UPGRADE.getValue() == specialArea) {
             // 升级专区，一次性补差升级
+            // 2025.08.18 雨汐团队，使用累计升级
             if (boxNum.compareTo(BigDecimal.ZERO) == 0) {
                 // 不满足升级条件
                 throw new ServiceException("不满足升级条件");
@@ -2402,6 +2403,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             // 当前会员等级
             BdGrade memberGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(updateGradeMember.getPkSettleGrade())).findFirst().get();
             if (RetailConstants.VERTEX_PK_ID.equals(updateGradeMember.getPkVertex())) {
+                // 雨汐团队特殊处理
                 if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0) {
                     // 会员等级大于等于V3（卓越），不能通过升级进行购买了
                     throw new ServiceException("当前已经是可以购买的最高等级");
@@ -2422,12 +2424,16 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             if (bdGrade.getGradeValue().equals(memberGrade.getGradeValue())
                     && (EGrade.HAI_FAN.getValue() == bdGrade.getGradeValue() || EGrade.YOU_KE.getValue() == bdGrade.getGradeValue())
             ) {
+                if (RetailConstants.VERTEX_PK_ID.equals(updateGradeMember.getPkVertex())) {
+                    // 雨汐团队特殊处理，雨汐团队使用累计升级，可以进行购买
+                    return bdGrade;
+                }
                 // 旧等级与新等级相同 并且 旧等级为V1或V2
                 return null;
             }
 
-            // 2025.08.01 非雨汐团队会多升2级
             // 特殊等级处理
+            // 2025.08.01 非雨汐团队会多升2级
             BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade.getPkId(), updateGradeMember.getPkVertex());
             if (null != isPay && EYesNo.YES.getIntValue() == isPay) {
                 // 支付时才进行处理
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
index 6c78b2c4..f60d4947 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
@@ -1134,14 +1134,8 @@
 
     <!-- 查询新零售购买指定商品数量（新） -->
     <select id="getRetailWaresQuantityNew" resultType="decimal">
-        select sum(nvl(soi.wares_quantity, 0) * bw.box_num) wares_quantity
+        select sum(so.box_num) wares_quantity
         from sa_order so
-        left join sa_order_items soi
-        on soi.pk_order = so.pk_id
-        and soi.del_flag = 0
-        and soi.is_gift = 1
-        left join bd_wares bw
-        on bw.pk_id = soi.pk_wares
         where so.del_flag = 0
         and so.order_status = 1
         and so.pk_member = #{pkMember}
@@ -1152,10 +1146,6 @@
         <foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and bw.wares_code in
-        <foreach collection="waresCodeList" item="items" open="(" close=")" separator=",">
-            #{items}
-        </foreach>
         <if test="payTime != null">
             and so.pay_time > #{payTime}
         </if>
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java
index 2c542073..c7a27361 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java
@@ -19,7 +19,7 @@ public class RetailConstants {
     public static final BigDecimal SAME_RATIO = new BigDecimal("0.005");
 
     /**
-     * 特殊体系PK_ID: 150
+     * 特殊体系PK_ID: 150（雨汐团队）
      * V4：总 500，小 100
      * V5：总 2000，小 400
      */