From b825373174b11d8b04eb1bf8cb15a75c081bf27a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Oct 2025 18:38:42 +0800
Subject: [PATCH] user_id

---
 .../main/resources/mapper/ShopUserMapper.xml  | 112 +++++++++---------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
index a76e284c..b6262bfa 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -118,74 +118,76 @@
 
 
      <select id="selectPushEventUser" resultType="com.czg.account.entity.ShopUser">
-        SELECT DISTINCT
-        u.id, u.head_img, u.nick_name, u.amount, u.account_points, u.phone,
-        <choose>
-            <!-- 当有筛选条件时才计算订单相关字段 -->
-            <when test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
+         SELECT DISTINCT
+         u.id,u.user_id, u.head_img, u.nick_name, u.amount, u.account_points, u.phone,
+         <choose>
+             <!-- 当有筛选条件时才计算订单相关字段 -->
+             <when test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
                    param.orderTimeTwoWeeks == 1 or param.orderTimeMoreThanTwoWeeks == 1 or
                    param.noOrder == 1 or param.oneOrder == 1 or param.fiveOrder == 1">
-                COUNT(o.id) AS order_count,
-                SUM(CASE WHEN o.trade_day = CURDATE() THEN 1 ELSE 0 END) AS today_orders,
-                SUM(CASE WHEN o.trade_day = CURDATE() - INTERVAL 1 DAY THEN 1 ELSE 0 END) AS yesterday_orders,
-                SUM(CASE WHEN o.trade_day >= CURDATE() - INTERVAL 2 WEEK AND o.trade_day &lt; CURDATE() - INTERVAL 1 DAY
-                THEN 1 ELSE 0 END) AS two_weeks_orders,
-                SUM(CASE WHEN o.trade_day &lt; CURDATE() - INTERVAL 2 WEEK THEN 1 ELSE 0 END) AS earlier_orders
-            </when>
-            <!-- 无筛选条件时不计算订单相关字段 -->
-            <otherwise>
-                0 AS order_count,
-                0 AS today_orders,
-                0 AS yesterday_orders,
-                0 AS two_weeks_orders,
-                0 AS earlier_orders
-            </otherwise>
-        </choose>
-        FROM tb_shop_user u
-        <!-- 只有当有筛选条件时才关联order表 -->
-        <if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
+                 COUNT(o.id) AS order_count,
+                 SUM(CASE WHEN o.trade_day = CURDATE() THEN 1 ELSE 0 END) AS today_orders,
+                 SUM(CASE WHEN o.trade_day = CURDATE() - INTERVAL 1 DAY THEN 1 ELSE 0 END) AS yesterday_orders,
+                 SUM(CASE WHEN o.trade_day >= CURDATE() - INTERVAL 2 WEEK AND o.trade_day &lt; CURDATE() - INTERVAL 1
+                 DAY
+                 THEN 1 ELSE 0 END) AS two_weeks_orders,
+                 SUM(CASE WHEN o.trade_day &lt; CURDATE() - INTERVAL 2 WEEK THEN 1 ELSE 0 END) AS earlier_orders
+             </when>
+             <!-- 无筛选条件时不计算订单相关字段 -->
+             <otherwise>
+                 0 AS order_count,
+                 0 AS today_orders,
+                 0 AS yesterday_orders,
+                 0 AS two_weeks_orders,
+                 0 AS earlier_orders
+             </otherwise>
+         </choose>
+         FROM tb_shop_user u
+         <!-- 只有当有筛选条件时才关联order表 -->
+         <if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
               param.orderTimeTwoWeeks == 1 or param.orderTimeMoreThanTwoWeeks == 1 or
               param.noOrder == 1 or param.oneOrder == 1 or param.fiveOrder == 1">
-            LEFT JOIN `tb_order_info` o ON u.user_id = o.user_id and o.user_id is not null AND o.shop_id = #{shopId} AND o.status = 'done'
-        </if>
-        WHERE u.main_shop_id = #{mainShopId} and u.phone is not null
-        <!-- 性别筛选条件 -->
+             LEFT JOIN `tb_order_info` o ON u.user_id = o.user_id and o.user_id is not null AND o.shop_id = #{shopId}
+             AND o.status = 'done'
+         </if>
+         WHERE u.main_shop_id = #{mainShopId} and u.phone is not null
+         <!-- 性别筛选条件 -->
          <if test="!(param.sexMan == 1 and param.sexWoman == 1 and param.sexUnknown == 1)
           and (param.sexMan == 1 or param.sexWoman == 1 or param.sexUnknown == 1)">
-            AND
-            <trim prefix="(" suffix=")" prefixOverrides="OR">
-                <if test="param.sexMan == 1">OR u.sex = 1</if>
-                <if test="param.sexWoman == 1">OR u.sex = 0</if>
-                <if test="param.sexUnknown == 1">OR u.sex IS NULL</if>
-            </trim>
-        </if>
+             AND
+             <trim prefix="(" suffix=")" prefixOverrides="OR">
+                 <if test="param.sexMan == 1">OR u.sex = 1</if>
+                 <if test="param.sexWoman == 1">OR u.sex = 0</if>
+                 <if test="param.sexUnknown == 1">OR u.sex IS NULL</if>
+             </trim>
+         </if>
 
-        <!-- 会员状态筛选 -->
-        <if test="param.isVip != null">
-            AND u.is_vip = #{param.isVip}
-        </if>
+         <!-- 会员状态筛选 -->
+         <if test="param.isVip != null">
+             AND u.is_vip = #{param.isVip}
+         </if>
 
          <if test="param.isRecharge != null">
              AND u.recharge_count <![CDATA[ ${param.isRecharge == 0 ? '=' : '>'} ]]> 0
          </if>
-        <!-- 只有当有筛选条件时才需要HAVING子句 -->
-        <if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
+         <!-- 只有当有筛选条件时才需要HAVING子句 -->
+         <if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
               param.orderTimeTwoWeeks == 1 or param.orderTimeMoreThanTwoWeeks == 1 or
               param.noOrder == 1 or param.oneOrder == 1 or param.fiveOrder == 1">
-            GROUP BY u.id
-            HAVING
-            <trim prefix="(" suffix=")" prefixOverrides="OR">
-                <if test="param.orderTimeToday == 1">OR today_orders > 0</if>
-                <if test="param.orderTimeYesterday == 1">OR yesterday_orders > 0</if>
-                <if test="param.orderTimeTwoWeeks == 1">OR two_weeks_orders > 0</if>
-                <if test="param.orderTimeMoreThanTwoWeeks == 1">OR earlier_orders > 0</if>
+             GROUP BY u.id
+             HAVING
+             <trim prefix="(" suffix=")" prefixOverrides="OR">
+                 <if test="param.orderTimeToday == 1">OR today_orders > 0</if>
+                 <if test="param.orderTimeYesterday == 1">OR yesterday_orders > 0</if>
+                 <if test="param.orderTimeTwoWeeks == 1">OR two_weeks_orders > 0</if>
+                 <if test="param.orderTimeMoreThanTwoWeeks == 1">OR earlier_orders > 0</if>
 
-                <if test="param.noOrder == 1">OR order_count = 0</if>
-                <if test="param.oneOrder == 1">OR order_count = 1</if>
-                <if test="param.fiveOrder == 1">OR order_count >= 5</if>
-            </trim>
-        </if>
-        order by u.create_time desc
-    </select>
+                 <if test="param.noOrder == 1">OR order_count = 0</if>
+                 <if test="param.oneOrder == 1">OR order_count = 1</if>
+                 <if test="param.fiveOrder == 1">OR order_count >= 5</if>
+             </trim>
+         </if>
+         order by u.create_time desc
+     </select>
 
 </mapper>