From 62b117865e7483aa1085b066d950ae9714b39dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 24 Sep 2025 11:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=B5=A0=E5=88=B8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/dto/MkRewardCouponDTO.java |  2 ++
 .../impl/TbMemberConfigServiceImpl.java       | 32 ++++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java
index 038f602f..d20cc373 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java
@@ -3,10 +3,12 @@ package com.czg.market.dto;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 
 @Data
+@Accessors(chain = true)
 public class MkRewardCouponDTO implements Serializable {
     @NotNull(message = "用户ID不能为空")
     private Long userId;
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 28ccbb44..60250f60 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
@@ -9,12 +9,9 @@ import com.alibaba.fastjson2.JSONObject;
 import com.czg.constant.TableValueConstant;
 import com.czg.exception.ApiNotPrintException;
 import com.czg.exception.CzgException;
-import com.czg.market.dto.MemberConfigDTO;
-import com.czg.market.dto.MemberLevelDTO;
+import com.czg.market.dto.*;
 import com.czg.account.entity.*;
 import com.czg.account.service.*;
-import com.czg.market.dto.MemberOrderDTO;
-import com.czg.market.dto.MkCouponGiftDTO;
 import com.czg.market.entity.*;
 import com.czg.market.service.*;
 import com.czg.market.vo.MemberConfigVO;
@@ -24,6 +21,7 @@ import com.czg.order.entity.OrderInfo;
 import com.czg.order.entity.OrderPayment;
 import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
+import com.czg.sa.StpKit;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.service.market.mapper.TbMemberConfigMapper;
 import com.czg.utils.AssertUtil;
@@ -70,7 +68,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     @Resource
     private MemberExpFlowService memberExpFlowService;
     @Resource
-    private MkCouponGiftService couponGiftService;
+    private MkShopCouponRecordService shopCouponRecordService;
 
     @Override
     public MemberConfigVO detail(Long shopId) {
@@ -319,7 +317,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
         // 条件开通
         if (memberOrderId == null) {
-            if(memberConfigVO.getConfigList() == null || memberConfigVO.getConfigList().isEmpty()) {
+            if (memberConfigVO.getConfigList() == null || memberConfigVO.getConfigList().isEmpty()) {
                 throw new CzgException("会员开通方案未配置，请联系店铺");
             }
 
@@ -354,7 +352,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
 //            shopUser.setEndTime(shopUser.getStartTime().plusDays(30));
             // 购买开通
-        }else {
+        } else {
 
             if (shopUser.getStartTime() == null || shopUser.getEndTime().isBefore(DateUtil.date().toLocalDateTime())) {
                 shopUser.setStartTime(DateUtil.date().toLocalDateTime());
@@ -397,19 +395,15 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                 deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId);
             }
 
+            // 发券流程
             if (StrUtil.isNotBlank(memberOrder.getCouponList())) {
-                // TODO 发券流程
-//            ArrayList<MkCouponGiftDTO> giftDTOS = new ArrayList<>();
-//            JSONArray.parseArray(memberOrder.getCouponList()).toJavaList(MemberConfigDTO.ConfigCoupon.class).forEach(item -> {
-//                giftDTOS.add(new MkCouponGiftDTO().setCouponId(item.getCoupon().getId())
-//                        .setCouponId(item.getCoupon().getId())
-//                        .setCouponName(item.getCoupon().getTitle())
-//                        .setSourceName("会员开通赠券")
-//                        .setSourceId(memberOrderId)
-//                        .setType(1)
-//                        .setNum(item.getNum()));
-//            });
-//            couponGiftService.addCouponGift(memberOrderId, "会员开通赠券", 1, giftDTOS);
+                JSONArray.parseArray(memberOrder.getCouponList()).toJavaList(MemberConfigDTO.ConfigCoupon.class).forEach(item -> {
+                    shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
+                            .setNum(item.getNum())
+                            .setUserId(shopUser.getUserId())
+                            .setShopId(shopId));
+
+                });
             }
 
             memberOrder.setStatus(OrderStatusEnums.DONE.getCode());