From 06af637303cff936114c6a84a3a0d1b38b098e18 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 03 Sep 2020 15:06:56 +0800
Subject: [PATCH] 20200903

---
 src/main/resources/mapper/modules/MemberMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 0e49d18..92f6b6c 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -63,7 +63,7 @@
 			member m
 		LEFT JOIN member_authentication a ON m.id = a.member_id
         <where>
-        	(m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10)
+        	m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10)
             <if test="record != null" >
                 <if test="record.account!=null and record.account!=''">
                     and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
@@ -109,6 +109,7 @@
 			m.phone,
 			m.email,
 			m.invite_id inviteId,
+			m.account_type accountType,
 			a.available_balance walletCoinAvailableBalance,
 			a.total_balance walletCoinTotalBalance,
 			a.frozen_balance walletCoinFrozenBalance,
@@ -128,7 +129,7 @@
                     and m.account_type= #{record.isTest}
                 </if>
 		</where>
-		order by m.create_time desc
+		order by a.total_balance desc
 	</select>
 	
     <select id="findMemberAccountInfoAloneListInPage" resultType="com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo">
@@ -183,7 +184,7 @@
 		LEFT JOIN member_wallet_contract a ON a.member_id = m.id
 		<where>
 			b.wallet_code = 'USDT'
-			and (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10)
+			and m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10)
 			<if test="record.account!=null and record.account!=''">
                     and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
             </if>
@@ -203,7 +204,7 @@
 	</select>
 	
 	<select id="selectMemberDataInfoDtoListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
-		select COUNT(m.id) as memberCount  from member m
+		select COUNT(m.id) as memberCount  from member m where m.account_type = 1
 	</select>
 	
 	<select id="selectMemberDataInfoDtoListInPageAlone" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
@@ -211,7 +212,7 @@
 	</select>
 	
 	<select id="findMemberDataInfoAllAloneTestListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
-		select COUNT(m.id) as memberCount  from member m 	WHERE (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) 
+		select COUNT(m.id) as memberCount  from member m 	WHERE (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10))
 	</select>
 	
 	<select id="selectMemberDataInfoDtoRealListInPageAlone" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
@@ -219,7 +220,7 @@
 	</select>
 	
 	<select id="findMemberDataInfoAloneTestDtoListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
-		select COUNT(m.id) as memberCount  from member m 	WHERE (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) and m.account_type = 1
+		select COUNT(m.id) as memberCount  from member m 	WHERE (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10)) and m.account_type = 1
 	</select>
 	
 	<select id="selectTotalAmountUsdtBForBasicRealDataBymemberId" resultType="java.lang.String">
@@ -363,7 +364,7 @@
 		WHERE
 			a. STATUS = 2
 		AND a.is_inside = 'N'
-		AND (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10)
+		AND ((m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) or a.id = '228' or a.id = '474')
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicAllDataAlone" resultType="java.lang.String">
 		SELECT
@@ -375,7 +376,7 @@
 		WHERE
 			a. STATUS = 2
 		AND a.is_inside = 'N'
-		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10 or a.id = '598' or a.id = '227' or a.id = '473' or a.id = '546')
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicData" resultType="java.lang.String">
 		SELECT
@@ -1452,4 +1453,37 @@
 		 select id from member where FIND_IN_SET(#{inviteId},referer_ids)
 	</select>
 	
+	<select id="selectMemberInfoDetailByInviteId" resultType="java.lang.String">
+		 select id from member where invite_id = #{inviteId}
+	</select>
+	
+	<select id="selectMemberDataInfoListSearchs" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+        SELECT
+			*
+		FROM
+			member  where FIND_IN_SET(#{inviteId}, referer_ids) 
+    </select>
+    
+	<select id="selectMemberByInviteId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+        SELECT
+			*
+		FROM
+			member m where m.invite_id = #{inviteId}
+    </select>
+    
+     <select id="selectDataInfoListSearchs" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+        SELECT
+			*
+		FROM
+			member m
+        <where>
+            <if test="record != null" >
+                <if test="record.account!=null and record.account!=''">
+                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
+                </if>
+            </if>
+        </where>
+        order by m.create_time desc
+    </select>
+	
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1