From 05a3be5ecb15da5f9b16780b3a378e254e98049c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 20 Oct 2025 10:51:18 +0800
Subject: [PATCH] =?UTF-8?q?sms=5Fpush=5Fevent=5Fuser=20=E5=A4=8D=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/task/AAMarketTasks.java      |  1 +
 .../java/com/czg/market/entity/SmsPushEventUser.java   |  7 ++++++-
 .../market/service/impl/SmsPushEventServiceImpl.java   | 10 ++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
index 693de631f..a12c30cd4 100644
--- a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
@@ -52,6 +52,7 @@ public class AAMarketTasks {
     }
 
 
+    //月累计 发送条数 累计金额
     @Resource
     private SmsShopMoneyTask smsShopMoneyTask;
     //每月1号 0点 0分 1秒 执行
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java
index b25237c77..7176b5686 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java
@@ -35,7 +35,12 @@ public class SmsPushEventUser implements Serializable {
     private Long id;
 
     /**
-     * sms_user_push_event的id
+     * sms-短信 ac-公众号
+     */
+    private String type;
+
+    /**
+     * sms_push_event的id 或者ac_push_event 的 id
      */
     private Long eventId;
 
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java
index c15b8e8db..606390289 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java
@@ -69,7 +69,9 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
                 continue;
             }
             SmsPushEventUser eventUser = eventUserMapper.selectOneByQuery(
-                    new QueryWrapper().eq(SmsPushEventUser::getEventId, record.getId())
+                    new QueryWrapper()
+                            .eq(SmsPushEventUser::getType, "sms")
+                            .eq(SmsPushEventUser::getEventId, record.getId())
             );
             record.setSmsPushEventUser(eventUser);
         }
@@ -96,6 +98,7 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
         save(pushEvent);
         if (param.getUserType() == 2) {
             SmsPushEventUser eventUser = param.getSmsPushEventUser();
+            eventUser.setType("sms");
             eventUser.setShopId(param.getShopId());
             eventUser.setEventId(pushEvent.getId());
             eventUserMapper.insert(eventUser);
@@ -129,6 +132,7 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
         eventUserMapper.deleteByQuery(new QueryWrapper().eq(SmsPushEventUser::getEventId, pushEvent.getId()));
         if (param.getUserType() == 2) {
             SmsPushEventUser eventUser = param.getSmsPushEventUser();
+            eventUser.setType("sms");
             eventUser.setShopId(param.getShopId());
             eventUser.setEventId(pushEvent.getId());
             eventUserMapper.insert(eventUser);
@@ -146,7 +150,9 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
         AssertUtil.isNull(smsPushEvent, "券发放失败，推送事件不存在");
         SmsPushEventDTO pushEvent = BeanUtil.toBean(smsPushEvent, SmsPushEventDTO.class);
         SmsPushEventUser eventUser = eventUserMapper.selectOneByQuery(
-                new QueryWrapper().eq(SmsPushEventUser::getEventId, eventId)
+                new QueryWrapper()
+                        .eq(SmsPushEventUser::getType, "sms")
+                        .eq(SmsPushEventUser::getEventId, eventId)
         );
         pushEvent.setSmsPushEventUser(eventUser);
         if (StrUtil.isNotBlank(pushEvent.getCoupon())) {