From bfbb03c514b9e60485ea13d5679e6af2e8aeb354 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 23 Nov 2022 09:44:23 +0800
Subject: [PATCH] 20221117
---
src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
index 8441ecf..5688825 100644
--- a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
@@ -6,8 +6,11 @@
select a.*, b.username username from dapp_account_money_change a
inner join dapp_member b on a.member_id=b.id
<where>
- <if test="record.address !='' and record.address != null">
- and (b.username = #{record.address} or b.invite_id=#{record.address})
+ <if test="record.description!=null and record.description!=''">
+ and (a.member_id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids)))
+ </if>
+ <if test="record.username !='' and record.username != null">
+ and b.username like CONCAT('%',#{record.username},'%')
</if>
<if test="record.type != null">
and a.type=#{record.type}
@@ -51,13 +54,47 @@
and a.type=#{record.type}
</if>
<if test="record.startTime != null and record.startTime != ''">
- and a.create_time >= #{record.startTime}
+ and date_format(a.create_time, '%Y-%m-%d') >= #{record.startTime}
</if>
<if test="record.endTime != null and record.endTime != ''">
- and a.create_time <= #{record.endTime}
+ and date_format(a.create_time, '%Y-%m-%d') <= #{record.endTime}
</if>
</where>
order by a.create_time desc
</select>
+ <select id="selectMoneyTotalInPage" resultType="cc.mrbird.febs.dapp.vo.AdminMoneyTotalVo">
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ date_format(create_time, '%Y-%m-%d') createTime
+ FROM
+ member_coin_charge
+ <where>
+ <if test="record.description!=null and record.description!=''">
+ and (member_id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids)))
+ </if>
+ </where>
+ GROUP BY
+ date_format(create_time, '%Y-%m-%d')
+ UNION
+ SELECT
+ date_format(create_time, '%Y-%m-%d') createTime
+ FROM
+ member_coin_withdraw
+ <where>
+ is_inside = 'N'
+ <if test="record.description!=null and record.description!=''">
+ and (member_id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids)))
+ </if>
+ </where>
+ GROUP BY
+ date_format(create_time, '%Y-%m-%d')
+ ) as a
+ ORDER BY
+ a.createTime DESC
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1