From 495d1412bba9a123881bd4515d8831984b750378 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 17 Nov 2025 11:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MkShopCouponRecordService.java      |  6 +++++-
 .../impl/MkShopCouponRecordServiceImpl.java     |  4 ++--
 .../service/impl/ShopCouponServiceImpl.java     | 17 +++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

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 af6d8d27b..0cd3c2dbc 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
@@ -47,10 +47,14 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
 
 
     /**
-     * 短信/公众号 事件发送优惠券
+     * 短信 事件发送优惠券
      * 通过事件发放优惠券
      */
     void smsGrantCoupon(SmsPushEventDTO param);
+    /**
+     * 公众号 事件发送优惠券
+     * 通过事件发放优惠券
+     */
     void acGrantCoupon(AcPushEventDTO param);
 
     /**
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 e1f1c6c2a..d478baa04 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
@@ -211,7 +211,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
                     giftDTO.setShopId(param.getShopId());
                     giftDTO.setSourceId(param.getId());
                     giftDTO.setCouponId(id);
-                    giftDTO.setSource("营销短信发放");
+                    giftDTO.setSource("公众号发放");
                     batchReceiveCoupon(giftDTO, num, userList);
                 }
             } catch (Exception e) {
@@ -247,7 +247,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
                     giftDTO.setShopId(param.getShopId());
                     giftDTO.setSourceId(param.getId());
                     giftDTO.setCouponId(id);
-                    giftDTO.setSource("营销短信发放");
+                    giftDTO.setSource("短信发放");
                     batchReceiveCoupon(giftDTO, num, userList);
                 }
             } catch (Exception e) {
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
index c4e14bbcb..38617e1d1 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
@@ -152,13 +152,13 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
     public void receivePopUp(Long shopId, Long userId, String getMode) {
         ShopUser shopUser = null;
         List<ShopCouponPopUp> popUps = getPopUp(shopId, userId, getMode);
-        if ("home".equals(getMode)) {
-            getMode = "首页";
-        } else if ("eat".equals(getMode)) {
-            getMode = "用餐";
-        } else if ("order".equals(getMode)) {
-            getMode = "订单";
-        }
+//        if ("home".equals(getMode)) {
+//            getMode = "首页";
+//        } else if ("eat".equals(getMode)) {
+//            getMode = "用餐";
+//        } else if ("order".equals(getMode)) {
+//            getMode = "订单";
+//        }
         for (ShopCouponPopUp popUp : popUps) {
             MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO();
             giftDTO.setShopId(shopId);
@@ -168,7 +168,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
             giftDTO.setShopUserId(shopUser.getId());
             giftDTO.setCouponId(popUp.getId());
             giftDTO.setSourceId(-1L);
-            giftDTO.setSource(getMode + "弹窗领取");
+            giftDTO.setSource("用户弹窗领取");
+//            giftDTO.setSource(getMode + "弹窗领取");
             recordService.receiveCoupon(giftDTO, 1, true);
         }
     }