From 407729ff6fc2181a417121e02f61aee7ce78fdda Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 16:34:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB

---
 src/main/resources/mapper/dapp/DappMemberDao.xml |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index ad20f83..17b1e54 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -14,25 +14,26 @@
     </select>
 
     <select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
-        select * from dapp_member
+        select a.*
+        from dapp_member a
         <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">
@@ -130,4 +131,58 @@
         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>
+
+    <update id="updateMemberAccountType">
+        update dapp_member
+        set account_type = #{accountType}
+        where id = #{id}
+    </update>
+
+    <update id="updateMemberActiveStatus">
+        update dapp_member
+        set active_status = #{accountStatus}
+        where id = #{id}
+    </update>
+
+    <select id="selectMemberInfoByRefererId" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+        select
+            *
+        from dapp_member a
+        where referer_id = #{refererId}
+    </select>
+
+    <select id="selectCountByAccountTypeAndRefererId" resultType="java.lang.Integer">
+        select count(id)
+        from dapp_member
+        <where>
+            referer_id = #{refererId}
+            <if test="accountType != null">
+                and account_type = #{accountType}
+            </if>
+        </where>
+    </select>
+
+    <select id="findTeamInfoListInPage" resultType="cc.mrbird.febs.dapp.vo.AdminTeamInfoVo">
+        select
+            a.address address,
+            a.invite_id inviteId,
+            a.account_type accountType,
+            a.active_status activeStatus,
+            a.id id
+        from dapp_member a
+        where
+            (a.id in (select id from dapp_member where FIND_IN_SET(#{record.inviteId}, referer_ids)))
+        order  by a.create_time desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1