From c309e73575d0acc7c7941596f96ffe3afe006947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 25 Mar 2025 00:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BD=99=E9=A2=9D=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ShopUserMapper.xml  | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 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 e3ff46000..813398d1b 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -39,31 +39,44 @@
     </select>
 
     <select id="selectAssetsSummary" resultType="com.czg.account.dto.user.userinfo.UserInfoAssetsSummaryDTO">
-        select sum(IFNULL(b.amount, 0))         as amount,
-               sum(IFNULL(b.account_points, 0)) as points,
-               count(c.id)             as couponNum
-        from tb_user_info as a
-                 join tb_shop_user as b on a.id = b.user_id
-                 join tb_shop_activate_coupon_record as c
-                           on c.shop_id = b.shop_id and c.shop_user_id = b.id and c.`status` = 1 and c.use_start_time &lt; now() and c.use_end_time > now()
-        where a.id = #{userId}
+        SELECT
+        SUM(amount) AS amount,
+        SUM(points) AS points,
+        COUNT(DISTINCT c.id) AS couponNum
+        FROM (
+        SELECT
+        b.id,
+        IFNULL(b.amount, 0) AS amount,
+        IFNULL(b.account_points, 0) AS points
+        FROM tb_shop_user AS b
+        WHERE b.user_id = #{userId}
+        ) AS sub_b
+        LEFT JOIN tb_shop_activate_coupon_record AS c
+        ON c.shop_id = sub_b.id
+        AND c.shop_user_id = sub_b.id
+        AND c.`status` = 1
+        AND c.use_start_time &lt; NOW()
+        AND c.use_end_time > NOW();
+
     </select>
     <select id="selectPageByKeyAndIsVip" resultType="com.czg.account.dto.shopuser.ShopUserDTO">
         SELECT
-            a.*,  COUNT(DISTINCT c.id) AS couponNum,
+        a.*, COUNT(DISTINCT c.id) AS couponNum,
         COUNT(DISTINCT d.id) AS orderNumber,
         IFNULL(SUM(DISTINCT f.amount), 0) AS rechargeAmount
         FROM
-            tb_shop_user a
-                left JOIN tb_user_info b ON b.id = a.user_id
-        left join tb_shop_activate_coupon_record c on c.shop_user_id=a.id and c.`status`=0 and c.use_start_time &lt; now() and c.use_end_time > now()
+        tb_shop_user a
+        left JOIN tb_user_info b ON b.id = a.user_id
+        left join tb_shop_activate_coupon_record c on c.shop_user_id=a.id and c.`status`=0 and c.use_start_time &lt;
+        now() and c.use_end_time > now()
         left join tb_order_info as d on d.user_id=a.user_id and d.shop_id=a.shop_id
-        left join tb_shop_user_flow as f on f.user_id=a.user_id and f.shop_id=a.shop_id and f.biz_code in ('cashIn', 'wechatIn', 'alipayIn')
+        left join tb_shop_user_flow as f on f.user_id=a.user_id and f.shop_id=a.shop_id and f.biz_code in ('cashIn',
+        'wechatIn', 'alipayIn')
 
         where a.shop_id=#{shopId}
-            <if test="isVip != null">
-                and a.is_vip=#{isVip}
-            </if>
+        <if test="isVip != null">
+            and a.is_vip=#{isVip}
+        </if>
         <if test="key != null and key != ''">
             and (a.nick_name like concat('%', #{key}, '%') or a.phone like concat('%', #{key}, '%'))
         </if>