From 23fb1bfbff13d87ff5bc6880c2a10a94cc5b0c64 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 Aug 2020 09:59:31 +0800
Subject: [PATCH] 20200814

---
 src/main/resources/mapper/modules/MemberMapper.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 0e49d18..42ca424 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,
@@ -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')
 	</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 = '227')
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicData" resultType="java.lang.String">
 		SELECT
@@ -1452,4 +1453,8 @@
 		 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>
+	
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1