From 8fb0ebb5b32e4ab8a4be3d7961b903299a08aa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 20 Feb 2025 18:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ShopUserMapper.xml  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 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 59b40a59e..87a2a0e3e 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -23,7 +23,7 @@
     <select id="selectUserSummary" resultType="com.czg.account.dto.shopuser.ShopUserSummaryDTO">
         select count(a.id) userTotal, sum(IFNULL(a.amount, 0)) balanceTotal,sum(IFNULL(b.amount,0)) chargeTotal from
         tb_shop_user as a
-        left join tb_shop_user_flow as b on a.id=b.user_id  and b.biz_code in ('cashIn', 'wechatIn',
+        left join tb_shop_user_flow as b on a.id=b.user_id and b.biz_code in ('cashIn', 'wechatIn',
         'alipayIn')
         where a.shop_id = #{shopId}
         <if test="isVip !=null">
@@ -37,18 +37,24 @@
         where a.user_id = #{userInfoId}
     </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, sum(IFNULL(c.over_num, 0)) as couponNum
+        select sum(IFNULL(b.amount, 0))         as amount,
+               sum(IFNULL(b.account_points, 0)) as points,
+               sum(IFNULL(c.over_num, 0))       as couponNum
         from tb_user_info as a
                  left join tb_shop_user as b on a.id = b.user_id
-                 left join tb_shop_activate_in_record as c on c.shop_id = b.shop_id
-        where a.id=#{userId}
+                 left join tb_shop_activate_coupon_record as c
+                           on c.shop_id = b.shop_id and c.vip_user_id = b.id and c.`status` = 'used'
+        where a.id = #{userId}
     </select>
     <select id="selectPageByKeyAndIsVip" resultType="com.czg.account.entity.ShopUser">
-        select tb_shop_user.* from tb_user_info
-        left join tb_shop_user on tb_user_info.id=tb_shop_user.user_id ${qwSql} limit ${pageOffset}, ${pageSize}
+        select tb_shop_user.*
+        from tb_user_info
+                 left join tb_shop_user on tb_user_info.id = tb_shop_user.user_id ${qwSql}
+        limit ${pageOffset}, ${pageSize}
     </select>
     <select id="selectPageByKeyAndIsVip_COUNT" resultType="java.lang.Long">
-        select count(1) from tb_user_info
-        left join tb_shop_user on tb_user_info.id=tb_shop_user.user_id ${qwSql}
+        select count(1)
+        from tb_user_info
+                 left join tb_shop_user on tb_user_info.id = tb_shop_user.user_id ${qwSql}
     </select>
 </mapper>