From 68827b97f2871bdfe99de0e555f8ab1df413ec6c Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 11 Jun 2025 16:28:57 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=92=A4=E5=8D=95=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=88168=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SaOrderServiceImpl.java      | 24 ++++++++-----------
 .../mapper/sale/order/SaOrderMapper.xml       |  2 +-
 2 files changed, 11 insertions(+), 15 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 d8edf030..8a16b38e 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
@@ -170,17 +170,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
     private IOrderBusinessService orderBusinessService;
     @Autowired
     private ISaOrderChargeLogService saOrderChargeLogService;
-
+    @Autowired
     private RedisService redisService;
 
     @Autowired
     private IBdWaresDetailService bdWaresDetailService;
 
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
-
     @Override
     public List<CuMemberExt> queryMemberExtByCondition(CuMember cuMember) {
         return memberServiceApi.getMemberInfo(cuMember).getData();
@@ -2529,14 +2524,15 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
         } else if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) {
             // 复购订单存在盒数商品撤单，需要处理降级操作
             if (saOrderExt.getBoxNum() > 0) {
-                Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId());
-                if (null == firstDate) {
-                    // 盒数商品订单最早的时间为空，则会员未激活
-                    cuMember.setPayTime(null);
-                    cuMember.setPayStatus(EPayStatus.UNPAID.getValue());
-                    cuMember.setIsActivate(EYesNo.NO.getIntValue());
-                    saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue());
-                }
+                // TODO 目前只有注册、升级才能激活，复购不进行处理
+//                Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId());
+//                if (null == firstDate) {
+//                    // 盒数商品订单最早的时间为空，则会员未激活
+//                    cuMember.setPayTime(null);
+//                    cuMember.setPayStatus(EPayStatus.UNPAID.getValue());
+//                    cuMember.setIsActivate(EYesNo.NO.getIntValue());
+//                    saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue());
+//                }
 
                 // TODO 恢复升级专区，复购专区不需要处理等级问题
 //                // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
index 62170638..9675c338 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
@@ -1543,7 +1543,7 @@
         where so.del_flag = 0
           and so.order_status = 1
           and so.pk_member = #{pkMember}
-          and so.order_type in (41, 42, 43)
+          and so.order_type in (41, 42)
           and so.box_num != 0
     </select>