From c9c9bde983d6b77d44d75ce9a0eba87a1aef55e2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 13 Nov 2022 23:48:39 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/dapp/DappMemberDao.xml |   59 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index fe9aa5a..d4c663f 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -14,25 +14,30 @@
     </select>
 
     <select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
-        select * from dapp_member
+        select a.*,
+               b.total_amount totalAmount,
+               b.frozen_amount frozenAmount,
+               b.available_amount availableAmount
+        from dapp_member a
+        inner 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})
+                and a.referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})
             </if>
             <if test="record.accountStatus != null">
-                and account_status = #{record.accountStatus}
+                and a.account_status = #{record.accountStatus}
             </if>
             <if test="record.changeAble != null">
-                and change_able = #{record.changeAble}
+                and a.change_able = #{record.changeAble}
             </if>
             <if test="record.withdrawAble != null">
-                and withdraw_able = #{record.withdrawAble}
+                and a.withdraw_able = #{record.withdrawAble}
             </if>
             <if test="record.inviteId != null and record.inviteId != ''">
-                and invite_id = #{record.inviteId}
+                and (a.invite_id = #{record.inviteId} or a.address = #{record.inviteId})
             </if>
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="selectAllMemberForInCome" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
@@ -102,6 +107,9 @@
             <if test="type==2">
                 and find_in_set(#{inviteId}, fee_profit_ids)
             </if>
+            <if test="status != null">
+                and active_status=#{status}
+            </if>
         </where>
     </select>
 
@@ -110,19 +118,32 @@
         where find_in_set(#{inviteId}, fee_profit_ids)
     </select>
 
-    <select id="selectTeamListInPage" resultType="cc.mrbird.febs.dapp.vo.TeamListVo">
-        select
-            concat(left(a.address,5), '******', right(a.address,5)) address,
-            (select count(1) from dapp_member b where find_in_set(a.invite_id, b.fee_profit_ids)
-            ) count,
-            (select ifnull(sum(c.balance),0) from dapp_member c where find_in_set(a.invite_id, c.fee_profit_ids)
-            ) coinCount
-        from dapp_member a
-        where find_in_set(#{record.inviteId}, a.fee_profit_ids)
-    </select>
-
     <select id="selectMakerAddress" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
         select * from dapp_member
-        where maker_type=2 and account_type='normal'
+        where maker_type=1 and account_type='normal'
+    </select>
+
+    <update id="updateMemberActive">
+        update dapp_member
+            set active_status = 2
+        where active_status = 1
+    </update>
+
+    <select id="selectNewestDirectMember" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+        select * from dapp_member
+        where referer_id=#{inviteId} and active_status=1
+        order by id desc
+        limit 1
+    </select>
+
+    <select id="selectMemberListNeedProfit" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+        select
+               *
+        from dapp_member a
+        inner join (
+            select referer_id, count(1) from dapp_member a
+            where active_status = 1
+            group by referer_id having count(1) > 3
+        ) b on a.invite_id=b.referer_id
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1