From 3156be749dfc93764850b27f7cc2b4514a3ae4d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Oct 2023 16:36:54 +0800
Subject: [PATCH] 用户收益列表
---
src/main/resources/mapper/modules/ChatUserMapper.xml | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/ChatUserMapper.xml b/src/main/resources/mapper/modules/ChatUserMapper.xml
index 5847b58..db8bda4 100644
--- a/src/main/resources/mapper/modules/ChatUserMapper.xml
+++ b/src/main/resources/mapper/modules/ChatUserMapper.xml
@@ -56,10 +56,17 @@
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>
+ a.is_robot = 0
<if test="record.phone != null and record.phone != ''">
and a.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
</if>
@@ -74,7 +81,7 @@
</if>
</where>
group by a.user_id
- HAVING groupRedBagNum > 0
+ HAVING teamPerkAmount > 0
order by
a.user_id asc ,a.create_time asc
</select>
@@ -175,9 +182,10 @@
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.address_type addressType,
a.state state
from member_coin_withdraw a
left join chat_user b on b.user_id = a.user_id
@@ -306,6 +314,7 @@
select
a.*,
b.nick_name nickName,
+ b.is_robot isRobot,
c.name groupName
from chat_red_bag a
left join chat_user b on b.user_id = a.from_user_id
@@ -316,6 +325,12 @@
<if test="record.name != null and record.name != ''">
and c.name like CONCAT('%', CONCAT(#{record.name}, '%'))
</if>
+ <if test="record.nickName != null and record.nickName != ''">
+ and b.nick_name like CONCAT('%', CONCAT(#{record.nickName}, '%'))
+ </if>
+ <if test="record.isRobot != null">
+ and b.is_robot = #{record.isRobot}
+ </if>
</if>
</where>
order by a.create_time desc
--
Gitblit v1.9.1