From e87cd6e99ee1993541badeae4c792db0c34b6cd4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 02:19:04 +0800
Subject: [PATCH] 20221021

---
 src/main/resources/mapper/dapp/DappMemberDao.xml |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 5eeeb2f..44dd7b6 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -14,7 +14,12 @@
     </select>
 
     <select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
-        select * from dapp_member a
+        select a.*,
+               b.total_amount totalAmount,
+               b.frozen_amount frozenAmount,
+               b.available_amount availableAmount
+               from dapp_member a
+        left join dapp_wallet_coin b on a.id = b.member_id
         <where>
 <!--            <if test="record.currentUser != null">-->
 <!--                and referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})-->
@@ -34,6 +39,9 @@
             </if>
             <if test="record.inviteId != null and record.inviteId != ''">
                 and a.invite_id = #{record.inviteId}
+            </if>
+            <if test="record.username != null and record.username != ''">
+                and a.username like CONCAT('%',#{record.username},'%')
             </if>
         </where>
         order by create_time desc
@@ -230,7 +238,8 @@
                 inner join dapp_member b on a.member_id = b.id
         where
             a.total_amount <![CDATA[ >= ]]> 51
-          and b.referer_id = #{inviteId}
+          and
+            (find_in_set(#{inviteId}, b.referer_ids) or b.invite_id = #{inviteId})
           and b.identity = #{identity}
 
     </select>
@@ -244,5 +253,22 @@
                a.*,b.username username
         from member_coin_charge a
         inner join dapp_member b on b.id = a.member_id
+        order  by create_time desc
+    </select>
+
+    <select id="selectTotalMemberByRefererIdAndIdentity" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+        select
+            b.id,
+            b.invite_id,
+            b.referer_id,
+            b.identity,
+            b.referer_ids
+        from
+            dapp_wallet_coin a
+                inner join dapp_member b on a.member_id = b.id
+        where
+            a.total_amount <![CDATA[ >= ]]> 51
+          and b.referer_id = #{inviteId}
+
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1