From 4b3a1f60418cc5d057a266fa9b9bce3f643b3953 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 28 Oct 2025 15:22:53 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RetailOrderServiceImpl.java       | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
index 7759825a..cc73a33b 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
@@ -839,16 +839,10 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
      * @return
      */
     private Boolean handleMemberActivate(CuMember cuMember, SaOrderExt saOrder) {
-        if ((null == cuMember.getIsActivate() || EYesNo.YES.getIntValue() != cuMember.getIsActivate())
-                && (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType() || EOrderType.RETAIL_REPURCHASE.getValue() == saOrder.getOrderType())
-        ) {
-            // 会员激活状态为空 或 未激活，并且是 注册、升级 订单，判断会员是否激活
-            // 存在指定盒数商品
-            cuMember.setIsActivate(EYesNo.YES.getIntValue());
-            if (EPayStatus.UNPAID.getValue() == cuMember.getPayStatus()) {
-                cuMember.setPayTime(saOrder.getPayTime());
-                cuMember.setPayStatus(EPayStatus.PAID.getValue());
-            }
+        cuMember.setIsActivate(EYesNo.YES.getIntValue());
+        if (EPayStatus.UNPAID.getValue() == cuMember.getPayStatus()) {
+            cuMember.setPayTime(saOrder.getPayTime());
+            cuMember.setPayStatus(EPayStatus.PAID.getValue());
             return true;
         }
         return false;