From b8bf19375db90bf5bd409cacfe6cb066c5f2b34a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 Oct 2022 00:19:56 +0800
Subject: [PATCH] 20221021

---
 src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
index ffdb44f..ba5dc3e 100644
--- a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
@@ -3,11 +3,11 @@
 <mapper namespace="cc.mrbird.febs.dapp.mapper.DappAccountMoneyChangeDao">
 
     <select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity">
-        select a.*, b.address address from dapp_account_money_change a
+        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.address = #{record.address} or b.invite_id=#{record.address})
+                and (b.username = #{record.address} or b.invite_id=#{record.address})
             </if>
             <if test="record.type != null">
                 and a.type=#{record.type}
@@ -28,10 +28,10 @@
                 and a.type=#{record.type}
             </if>
             <if test="record.startTime != null and record.startTime != ''">
-                and a.create_time &gt;= #{record.startTime}
+                and date_format(a.create_time, '%Y-%m-%d') &gt;= #{record.startTime}
             </if>
             <if test="record.endTime != null and record.endTime != ''">
-                and a.create_time &lt;= #{record.endTime}
+                and date_format(a.create_time, '%Y-%m-%d') &lt;= #{record.endTime}
             </if>
         </where>
         order by a.create_time desc
@@ -41,18 +41,20 @@
         select
         a.create_time createTime,
         a.amount amount,
-        a.type type
+        a.type type,
+        ifnull(b.username,'-') username
         from dapp_account_money_change a
+        inner join dapp_member b on a.member_id = b.id
         <where>
             a.member_id in (select b.id from dapp_member b where find_in_set(#{record.inviteId}, b.referer_ids))
             <if test="record.type != null">
                 and a.type=#{record.type}
             </if>
             <if test="record.startTime != null and record.startTime != ''">
-                and a.create_time &gt;= #{record.startTime}
+                and date_format(a.create_time, '%Y-%m-%d') &gt;= #{record.startTime}
             </if>
             <if test="record.endTime != null and record.endTime != ''">
-                and a.create_time &lt;= #{record.endTime}
+                and date_format(a.create_time, '%Y-%m-%d') &lt;= #{record.endTime}
             </if>
         </where>
         order by a.create_time desc

--
Gitblit v1.9.1