From bf1a4fbff7621bf7b598ff37cc011318b138bf27 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 15 Dec 2025 10:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkShopCouponRecordServiceImpl.java   | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

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 4e4db8f8c..1ffbcb1b1 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
@@ -66,21 +66,24 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
     @Resource
     private ShopCouponMapper couponService;
 
-    private static final List<String> TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取");
+    private static final List<String> TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券",
+            "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取", "积分兑换");
 
-    private static final Map<String, String> SOURCE_TO_CATEGORY = Map.of(
-            "用户弹窗领取", "用户领取",
-            "兑换码兑换", "用户领取",
-            "群聊发放", "群聊发放",
-            "短信发放", "推广发放",
-            "公众号发放", "推广发放",
-            "管理员赠送", "管理员赠送",
-            "消费赠券", "系统发送",
-            "充值赠券", "系统发送",
-            "生日赠券", "系统发送",
-            "购买会员赠券", "系统发送"
+    private static final Map<String, String> SOURCE_TO_CATEGORY = Map.ofEntries(
+            Map.entry("用户弹窗领取", "用户领取"),
+            Map.entry("兑换码兑换", "用户领取"),
+            Map.entry("积分兑换", "用户领取"),
+            Map.entry("群聊发放", "群聊发放"),
+            Map.entry("短信发放", "推广发放"),
+            Map.entry("公众号发放", "推广发放"),
+            Map.entry("管理员赠送", "管理员赠送"),
+            Map.entry("消费赠券", "系统发送"),
+            Map.entry("充值赠券", "系统发送"),
+            Map.entry("生日赠券", "系统发送"),
+            Map.entry("购买会员赠券", "系统发送")
     );
 
+    //"积分兑换", "用户领取"
 
     @Override
     public List<CouponReceiveVo> queryReceive(QueryReceiveDto param) {
@@ -241,7 +244,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
         CompletableFuture.runAsync(() -> {
             try {
                 SmsPushEventUser smsPushEventUser = param.getPushEventUser();
-                List<ShopUser> userList = new ArrayList<>();
+                List<ShopUser> userList;
                 if (param.getUserType() == 1) {
                     smsPushEventUser = new SmsPushEventUser();
                     smsPushEventUser.setShopId(param.getShopId());
@@ -277,7 +280,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
         CompletableFuture.runAsync(() -> {
             try {
                 SmsPushEventUser smsPushEventUser = param.getSmsPushEventUser();
-                List<ShopUser> userList = new ArrayList<>();
+                List<ShopUser> userList;
                 if (param.getUserType() == 1) {
                     smsPushEventUser = new SmsPushEventUser();
                     smsPushEventUser.setShopId(param.getShopId());