From 9a196e4d4a355ab3dfa20b4fb0bef27405676e1d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Oct 2025 18:25:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E6=94=BE=20?=
 =?UTF-8?q?=E5=88=B8=E5=8F=91=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AShopUserServiceImpl.java    |  1 -
 .../service/impl/SmsPushEventServiceImpl.java | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
index c43db703..c90942c8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
@@ -111,7 +111,6 @@ public class AShopUserServiceImpl implements AShopUserService {
 
     @Override
     public List<ShopUser> getPushEventUserList(SmsPushEventUser smsPushEventUser) {
-        List<Long> shopUserIds = new ArrayList<>();
         Long mainShopId = shopInfoService.getMainIdByShopId(smsPushEventUser.getShopId());
         smsPushEventUser.checkIsAll();
         // 调用Mapper层查询
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 6633a3dd..a35d4930 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
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
@@ -133,25 +134,20 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
         // 推送消息 进行 消息发送
         rabbitPublisher.sendApplySmsMsg(pushEvent.getShopId() + "," + pushEvent.getId(), "sendMarkSms");
         //发放优惠券
-        CompletableFuture.runAsync(() -> {
-            try {
-                grantCoupon(param);
-            } catch (Exception e) {
-                log.error("异步发放优惠券失败", e);
-            }
-        });
+        grantCoupon(param);
+
     }
 
     @Override
     public void sendPushEventCoupon(String eventId) {
-        SmsPushEventDTO pushEvent = getObjAs(new QueryWrapper().eq(SmsPushEvent::getId, eventId), SmsPushEventDTO.class);
-        AssertUtil.isNull(pushEvent, "券发放失败，推送事件不存在");
+        SmsPushEvent smsPushEvent = getOne(new QueryWrapper().eq(SmsPushEvent::getId, eventId));
+        AssertUtil.isNull(smsPushEvent, "券发放失败，推送事件不存在");
+        SmsPushEventDTO pushEvent = BeanUtil.toBean(smsPushEvent, SmsPushEventDTO.class);
         SmsPushEventUser eventUser = eventUserMapper.selectOneByQuery(
                 new QueryWrapper().eq(SmsPushEventUser::getEventId, eventId)
         );
-        AssertUtil.isNull(eventUser, "券发放失败，推送事件用户群体不存在");
         pushEvent.setSmsPushEventUser(eventUser);
-        if (pushEvent.getSendType() == 1 && StrUtil.isNotBlank(pushEvent.getCoupon())) {
+        if (StrUtil.isNotBlank(pushEvent.getCoupon())) {
             grantCoupon(pushEvent);
         }
     }
@@ -162,7 +158,14 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
         //发放优惠券
         CompletableFuture.runAsync(() -> {
             try {
-                List<ShopUser> userList = shopUserService.getPushEventUserList(param.getSmsPushEventUser());
+                SmsPushEventUser smsPushEventUser = param.getSmsPushEventUser();
+                List<ShopUser> userList = new ArrayList<>();
+                if (param.getUserType() == 1) {
+                    smsPushEventUser = new SmsPushEventUser();
+                    smsPushEventUser.setShopId(param.getShopId());
+                    smsPushEventUser.setIsAll(1);
+                }
+                userList = shopUserService.getPushEventUserList(smsPushEventUser);
                 // 2. 将JSON字符串解析为JSONArray
                 JSONArray couponArray = JSON.parseArray(param.getCoupon());