From 2deac812682fd09f4dedd52867a71fb67814acc0 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Oct 2025 09:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/market/entity/SmsPushEventUser.java   | 22 +++++++++++++++++++
 .../service/impl/AShopUserServiceImpl.java    |  1 +
 2 files changed, 23 insertions(+)

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 dee3ba74..b25237c7 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
@@ -107,6 +107,28 @@ public class SmsPushEventUser implements Serializable {
     private Integer page;
     @Column(ignore = true)
     private Integer size;
+    @Column(ignore = true)
+    private Integer isAll;
+
+    /**
+     * 是否查询所有用户 1查询所有用户 其余不查
+     */
+    public void checkIsAll() {
+        if (isAll != null && isAll == 1) {
+            sexMan = 0;
+            sexWoman = 0;
+            sexUnknown = 0;
+            isVip = null;
+            isRecharge = null;
+            noOrder = 0;
+            oneOrder = 0;
+            fiveOrder = 0;
+            orderTimeToday = 0;
+            orderTimeYesterday = 0;
+            orderTimeTwoWeeks = 0;
+            orderTimeMoreThanTwoWeeks = 0;
+        }
+    }
 
     public Integer getPage() {
         return page == null ? 1 : page;
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 66aae2e4..392b4785 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
@@ -97,6 +97,7 @@ public class AShopUserServiceImpl implements AShopUserService {
         try {
             Long mainShopId = shopInfoService.getMainIdByShopId(smsPushEventUser.getShopId());
             PageHelper.startPage(smsPushEventUser.getPage(), smsPushEventUser.getSize());
+            smsPushEventUser.checkIsAll();
             // 调用Mapper层查询
             List<ShopUser> shopUsers = shopUserMapper.selectPushEventUser(mainShopId,
                     smsPushEventUser.getShopId(), smsPushEventUser);