From 9c728249f7c9f3a94100d88b2c49055348a735e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 18:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E4=BC=9A=E5=91=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/dto/MemberConfigDTO.java   |  2 +-
 .../market/service/TbMemberConfigService.java |  2 +-
 .../impl/TbMemberConfigServiceImpl.java       | 25 +++++++++++--------
 .../service/impl/OrderInfoServiceImpl.java    |  8 +++---
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
index ec6a71d1..e6a06d8e 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
@@ -20,7 +20,7 @@ public class MemberConfigDTO {
     public static class ConfigCoupon {
         @Min(value = 1, message = "数量不能小于1")
         private Integer num;
-        private ShopCoupon shopCoupon;
+        private ShopCoupon coupon;
     }
 
     @Data
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java
index 2ca6abd1..7838af69 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java
@@ -34,7 +34,7 @@ public interface TbMemberConfigService extends IService<TbMemberConfig> {
      * @param userId 用户id
      * @return 是否加入成功
      */
-    boolean joinMember(Long shopId, Long userId);
+    boolean joinMember(Long shopId, Long userId, Long memberOrderId);
 
     /**
      * 发放会员奖励
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index b0efa067..09f29400 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -17,6 +17,7 @@ import com.czg.market.entity.ShopCoupon;
 import com.czg.market.entity.TbMemberConfig;
 import com.czg.market.service.MemberLevelConfigService;
 import com.czg.market.service.TbMemberConfigService;
+import com.czg.order.entity.MemberOrder;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.entity.OrderPayment;
 import com.czg.order.service.OrderInfoService;
@@ -106,10 +107,10 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
             memberConfig.setConfigList(JSONObject.toJSONString(memberDTO.getConfigList()));
         }
 
-        if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() &&
-                (memberConfig.getConditionList() != null || !memberConfig.getConditionList().isEmpty())) {
-            throw new CzgException("会员开通方式为单选条件");
-        }
+//        if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() &&
+//                (memberConfig.getConditionList() != null || !memberConfig.getConditionList().isEmpty())) {
+//            throw new CzgException("会员开通方式为单选条件");
+//        }
 
         if (memberDTO.getConditionList() != null && !memberDTO.getConditionList().isEmpty()) {
 //            ArrayList<String> conditionList = CollUtil.newArrayList(conditionMap);
@@ -238,7 +239,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     }
 
     @Override
-    public boolean joinMember(Long shopId, Long userId) {
+    public boolean joinMember(Long shopId, Long userId, Long memberOrderId) {
         MemberConfigVO memberConfigVO = detail(shopId);
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId));
         if (shopUser == null) {
@@ -246,8 +247,15 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
             return false;
         }
         boolean canOpen = false;
-        // 条件开通
-        if (memberConfigVO.getOpenAmount() == null) {
+        // 购买开通
+        if (memberOrderId != null) {
+//            MemberOrder memberOrder = memberOrderService.getOne(new QueryWrapper().eq(MemberOrder::getId, payment.getRelatedId()));
+//            if (memberOrder == null) {
+//                log.warn("会员购买支付失败，会员订单不存在，会员订单id：{}", payment.getRelatedId());
+//                return;
+//            }
+            // 条件开通
+        } else if ("CONDITION".equals(memberConfigVO.getOpenType())){
             for (MemberConfigDTO.condition item : memberConfigVO.getConditionList()) {
                 canOpen = switch (item.getCode()) {
                     case "BIND_PHONE" -> StrUtil.isNotBlank(shopUser.getPhone());
@@ -266,9 +274,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                 };
 
             }
-
-            // 购买开通
-        } else {
         }
 
         if (canOpen) {
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index f145a37f..7d1c7881 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -23,10 +23,7 @@ import com.czg.exception.CzgException;
 import com.czg.exception.OrderCancelException;
 import com.czg.market.service.TbMemberConfigService;
 import com.czg.order.dto.*;
-import com.czg.order.entity.CashierCart;
-import com.czg.order.entity.OrderDetail;
-import com.czg.order.entity.OrderInfo;
-import com.czg.order.entity.OrderPayment;
+import com.czg.order.entity.*;
 import com.czg.order.enums.PayEnums;
 import com.czg.order.service.*;
 import com.czg.order.vo.*;
@@ -701,7 +698,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
                 }
             }else if ("memberPay".equals(payment.getPayType())) {
-//                memberConfigService.joinMember()
+
+                memberConfigService.joinMember(payment.getShopId(), payment.getSourceId(), payment.getRelatedId());
             }
         }
     }