From 107c4d630c5b5c1b04f0d63a147e363b68dd1e8c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 27 Oct 2023 17:57:53 +0800
Subject: [PATCH] 版本管理

---
 src/main/resources/mapper/modules/ChatUserMapper.xml |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/ChatUserMapper.xml b/src/main/resources/mapper/modules/ChatUserMapper.xml
index c02649c..411497c 100644
--- a/src/main/resources/mapper/modules/ChatUserMapper.xml
+++ b/src/main/resources/mapper/modules/ChatUserMapper.xml
@@ -56,9 +56,15 @@
             FROM chat_red_bag c
             where c.from_user_id = a.user_id
                 AND c.msg_type = 'GROUP'
-        ) groupRedBagNum
+        ) groupRedBagNum,
+        (
+            select IFNULL(sum(IFNULL(d.amount,0)),0)
+            from chat_amount_flow d
+            where (d.type = 7 or d.type = 9)
+            and d.user_id = a.user_id
+        ) teamPerkAmount
         from chat_user a
-        left join chat_wallet b on b.user_id = a.user_id and type = 'USDT'
+        left join chat_wallet b on b.user_id = a.user_id and b.type = 'USDT'
         <where>
             <if test="record.phone != null and record.phone != ''">
                 and a.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
@@ -74,6 +80,7 @@
             </if>
         </where>
         group by a.user_id
+        HAVING teamPerkAmount > 0
         order by
         a.user_id asc ,a.create_time asc
     </select>
@@ -174,7 +181,7 @@
         b.nick_name nickName,
         b.phone phone,
         a.id id,
-        a.amount amount,
+        (a.amount - a.fee) amount,
         a.type type,
         a.address address,
         a.state state
@@ -359,6 +366,20 @@
         </if>
     </select>
 
+
+    <select id="selectTotalTypeByUserId" resultType="java.math.BigDecimal">
+        select IFNULL(sum(IFNULL(amount,0)),0)
+        from chat_amount_flow
+        where type = #{type}
+          and user_id = #{userId}
+        <if test='dateType == "D"'>
+            and date_format(create_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d');
+        </if>
+        <if test='dateType == "M"'>
+            and date_format(create_time, '%Y-%m') = date_format(#{date}, '%Y-%m');
+        </if>
+    </select>
+
     <select id="selectUserList" resultType="cc.mrbird.febs.mall.entity.ChatUser">
         select
         a.*

--
Gitblit v1.9.1