From 0c95f99dae780bc2552c27489ac5468d003239f5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 16:31:07 +0800
Subject: [PATCH] 20200721  代码提交

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

diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 8c004cc..1062c1a 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -40,22 +40,13 @@
 			member m
 		LEFT JOIN member_authentication a ON m.id = a.member_id
         <where>
-        	FIND_IN_SET('22015141', m.referer_ids)
+        	( FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
             <if test="record != null" >
-                <if test="record.startTime!=null">
-                    and m.create_time >=#{record.startTime}
-                </if>
-                <if test="record.endTime!=null">
-                    and #{record.endTime} >= m.create_time
-                </if>
                 <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 test="record.accountStatus!=null">
-                    and m.account_status = #{record.accountStatus}
-                </if>
-                <if test="record.accountType != null" >
-                    and m.account_type = #{record.accountType}
+                 <if test="record.isTest!=null and record.isTest!=''">
+                    and m.account_type= #{record.isTest}
                 </if>
                 <if test="record.certifyStatus != null and record.certifyStatus!=''">
                     and m.certify_status = #{record.certifyStatus}
@@ -102,7 +93,8 @@
 		select COUNT(m.id) as memberCount  from member m
 	</select>
 	<select id="selectMemberDataInfoDtoListInPageAlone" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
-		select COUNT(m.id) as memberCount  from member m 	WHERE FIND_IN_SET('22015141', m.referer_ids);
+		select COUNT(m.id) as memberCount  from member m 	WHERE FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	
 	<select id="selectTotalAmountUsdtBForBasicRealDataBymemberId" resultType="java.lang.String">
@@ -140,6 +132,7 @@
 		where 
 			s.symbol = 'USDT'
 		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectTotalAmountUsdtBForBasicData" resultType="java.lang.String">
 		SELECT
@@ -187,6 +180,7 @@
 			a. STATUS = 2
 		AND a.is_inside = 'N'
 		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicData" resultType="java.lang.String">
 		SELECT
@@ -236,6 +230,7 @@
 			a.order_type = 'B'
 		AND a.order_status = 3
 		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectTotalAmountUsdtCZForBasicData" resultType="java.lang.String">
 		SELECT
@@ -284,6 +279,7 @@
 			a.order_type = 'S'
 		AND a.order_status = 2
 		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectTotalAmountUsdtTXForBasicData" resultType="java.lang.String">
 		SELECT
@@ -367,6 +363,7 @@
 		a.closing_type = '0'
 		and a.order_status = '1'
 		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectClosingpriceForBasicData" resultType="java.lang.String">
 		SELECT
@@ -416,6 +413,7 @@
 			a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
 			and a.order_status = '1'
 		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectSellClosingpriceForBasicData" resultType="java.lang.String">
 		SELECT
@@ -463,7 +461,8 @@
 		WHERE
 			a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
 		AND a.order_status = '1'
-		AND FIND_IN_SET('22015141', m.referer_ids);
+		AND FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectRewardratioForBasicData" resultType="java.lang.String">
 		SELECT
@@ -524,6 +523,7 @@
 						WHERE
 							account_type = '1'
 							AND FIND_IN_SET('22015141',referer_ids)
+							and account_type = 1
 					)
 				GROUP BY
 					s.member_id
@@ -570,6 +570,7 @@
 			a.wallet_code = 'USDT'
 		AND a.available_balance > 1
 		AND FIND_IN_SET('22015141', m.referer_ids)
+							and m.account_type = 1;
 	</select>
 	<select id="selectBBZHForBasicData" resultType="java.lang.String">
 		SELECT
@@ -608,7 +609,8 @@
 		WHERE
 			a.wallet_code = 'USDT'
 		AND a.total_balance > 1
-		AND FIND_IN_SET('22015141', m.referer_ids);
+		AND FIND_IN_SET('22015141', m.referer_ids)
+							and m.account_type = 1;
 	</select>
 	<select id="selectHYZHForBasicData" resultType="java.lang.String">
 		SELECT
@@ -649,7 +651,8 @@
 		FROM
 			contract_order a
 		LEFT JOIN member m ON m.id = a.member_id
-		WHERE FIND_IN_SET('22015141', m.referer_ids);
+		WHERE FIND_IN_SET('22015141', m.referer_ids)
+							and m.account_type = 1;
 	</select>
 	<select id="selectprepriceForBasicData" resultType="java.lang.String">
 		SELECT
@@ -691,7 +694,8 @@
 		LEFT JOIN member m ON m.id = a.member_id
 		WHERE
 			a.wallet_code = 'USDT'
-		AND FIND_IN_SET('22015141', m.referer_ids);
+		AND FIND_IN_SET('22015141', m.referer_ids)
+							and m.account_type = 1;
 	</select>
 	<select id="selectBBZCForBasicData" resultType="java.lang.String">
 		SELECT
@@ -732,7 +736,8 @@
 			member_wallet_contract a
 			
 		LEFT JOIN member m ON m.id = a.member_id
-		WHERE FIND_IN_SET('22015141', m.referer_ids);
+		WHERE FIND_IN_SET('22015141', m.referer_ids) 
+		and m.account_type = 1;
 	</select>
 	<select id="selectHYZCForBasicData" resultType="java.lang.String">
 		SELECT
@@ -771,7 +776,8 @@
 			member_wallet_agent a
 			
 		LEFT JOIN member m ON m.id = a.member_id
-		WHERE FIND_IN_SET('22015141', m.referer_ids);
+		WHERE FIND_IN_SET('22015141', m.referer_ids)
+		and m.account_type = 1;
 	</select>
 	<select id="selectDLZCForBasicData" resultType="java.lang.String">
 		SELECT

--
Gitblit v1.9.1