From 921aa45ca1a63fd4560e6bffd65329b906ec1aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 25 Nov 2025 13:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=A0=E5=88=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/controller/admin/ACouponController.java | 2 +-
 .../com/czg/market/service/MkShopCouponRecordService.java     | 2 +-
 .../market/service/impl/MkBirthdayGiftServiceImpl.java        | 2 +-
 .../market/service/impl/MkShopCouponRecordServiceImpl.java    | 4 ++--
 .../market/service/impl/MkShopRechargeServiceImpl.java        | 2 +-
 .../market/service/impl/TbMemberConfigServiceImpl.java        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java
index 6cf29e5e9..8af960ee3 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java
@@ -201,7 +201,7 @@ public class ACouponController {
      */
     @PostMapping("/grant")
     public CzgResult<Boolean> rewardCoupon(@Validated @RequestBody MkRewardCouponDTO rewardCouponDTO) {
-        return CzgResult.success(couponRecordService.grant(rewardCouponDTO.getShopId() != null ? rewardCouponDTO.getShopId() : StpKit.USER.getShopId(), rewardCouponDTO));
+        return CzgResult.success(couponRecordService.grant(rewardCouponDTO.getShopId() != null ? rewardCouponDTO.getShopId() : StpKit.USER.getShopId(), rewardCouponDTO, "管理员赠送"));
     }
 
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
index e5e52e8ac..da3ec2bbb 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
@@ -63,6 +63,6 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
      */
     void deleteRecord(Long id);
 
-    Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO);
+    Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO, String source);
 
 }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
index cf267d84c..97b4a62ef 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
@@ -216,7 +216,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
                                         shopCouponRecordService.grant(birthdayGift.getMainShopId(), new MkRewardCouponDTO().setCouponId(couponInfo.getId())
                                                 .setNum(couponInfo.getNum())
                                                 .setUserId(shopUser.getUserId())
-                                                .setShopId(birthdayGift.getMainShopId()));
+                                                .setShopId(birthdayGift.getMainShopId()), "生日赠券");
                                         MkBirthdayGiftRecordCoupon recordCoupon = new MkBirthdayGiftRecordCoupon().setCouponName(shopCoupon.getTitle()).setNum(couponInfo.getNum())
                                                 .setType(TableValueConstant.BirthdayGiftRecordCoupon.Type.GIVE.getCode())
                                                 .setRecordId(giftRecord.getId()).setUserId(shopUser.getUserId()).setShopUserId(shopUser.getId());
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
index 95d0f71b4..b9db3a381 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
@@ -500,14 +500,14 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
     }
 
     @Override
-    public Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO) {
+    public Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO, String source) {
         Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId);
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainIdByShopId).eq(ShopUser::getUserId, rewardCouponDTO.getUserId()));
         MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(rewardCouponDTO.getCouponId())
                 .setShopId(shopId)
                 .setSourceId(rewardCouponDTO.getUserId())
                 .setShopUserId(shopUser == null ? null : shopUser.getId())
-                .setSource("后台发放");
+                .setSource(source);
         receiveCoupon(giftDTO, rewardCouponDTO.getNum(), false);
         return true;
     }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
index 941f0c5f4..1172116dc 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
@@ -202,7 +202,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
                         shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getId())
                                 .setNum(item.getNum())
                                 .setUserId(shopUser.getUserId())
-                                .setShopId(shopId));
+                                .setShopId(shopId), "充值赠券");
                     }catch (Exception e) {
                         log.warn("发放优惠券失败", e);
                     }
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 b42a2d005..7cf662635 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
@@ -354,7 +354,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                             shopCouponRecordService.grant(shopUser.getMainShopId(), new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
                                     .setNum(item.getNum())
                                     .setUserId(shopUser.getUserId())
-                                    .setShopId(shopUser.getMainShopId()));
+                                    .setShopId(shopUser.getMainShopId()), "会员任务赠券");
 
                         });
 //                        couponGiftService.addCouponGift(memberOrderId, "会员开通赠券", 1, giftDTOS);
@@ -505,7 +505,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                     shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
                             .setNum(item.getNum())
                             .setUserId(shopUser.getUserId())
-                            .setShopId(shopId));
+                            .setShopId(shopId), "购买会员赠券");
                 } catch (Exception e) {
                     log.error("发券失败", e);
                 }