From 5bd4fd809176f60c4118f43ad3568670e186ae1a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Oct 2025 09:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=90=A5=E9=94=80=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BB=BB=E5=8A=A1=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/service/account/mapper/ShopUserMapper.java    | 2 +-
 .../account/service/impl/AShopUserServiceImpl.java        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java
index bc089a3b..695edabf 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java
@@ -43,7 +43,7 @@ public interface ShopUserMapper extends BaseMapper<ShopUser> {
      * @param shopId           店铺ID
      * @return 分页结果
      */
-    Page<ShopUser> selectPushEventUser(
+    List<ShopUser> selectPushEventUser(
             @Param("mainShopId") Long mainShopId,
             @Param("shopId") Long shopId,
             SmsPushEventUser smsPushEventUser
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 efe6a9e3..713ad6a6 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
@@ -102,11 +102,9 @@ public class AShopUserServiceImpl implements AShopUserService {
             PageHelper.startPage(smsPushEventUser.getPage(), smsPushEventUser.getSize());
             Long mainShopId = shopInfoService.getMainIdByShopId(smsPushEventUser.getShopId());
             // 调用Mapper层查询
-            return shopUserMapper.selectPushEventUser(
-                    mainShopId,
-                    smsPushEventUser.getShopId(),
-                    smsPushEventUser
-            );
+            List<ShopUser> shopUsers = shopUserMapper.selectPushEventUser(mainShopId,
+                    smsPushEventUser.getShopId(), smsPushEventUser);
+            return PageUtil.convert(new PageInfo<>(shopUsers));
         }catch (Exception e){
             log.info("获取营销推送任务用户列表失败{},{}", smsPushEventUser, e.getMessage());
             return new Page<>();