From e0f4c137dd3f9d05f9808127a56463b7b039526f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Jul 2020 17:07:26 +0800
Subject: [PATCH] 20200720  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java            |   28 +++++++
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   28 +++---
 src/main/resources/mapper/modules/MemberMapper.xml                                |  177 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 219 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index e303696..b417d08 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -122,5 +122,33 @@
 	String selectHYZCForBasicData();
 
 	String selectDLZCForBasicData();
+
+	String selectTotalAmountUsdtSForBasicRealDataAlone();
+
+	String selectTotalAmountUsdtCZForBasicRealDataAlone();
+
+	String selectTotalAmountUsdtTXForBasicRealDataAlone();
+
+	String selectReturnMoneyForBasicRealDataAlone();
+
+	String selectClosingpriceForBasicRealDataAlone();
+
+	String selectSellClosingpriceForBasicRealDataAlone();
+
+	String selectRewardratioForBasicRealDataAlone();
+
+	String selectSFCCForBasicRealDataAlone();
+
+	String selectBBZHForBasicRealDataAlone();
+
+	String selectHYZHForBasicRealDataAlone();
+
+	String selectprepriceForBasicRealDataAlone();
+
+	String selectBBZCForBasicRealDataAlone();
+
+	String selectHYZCForBasicRealDataAlone();
+
+	String selectDLZCForBasicRealDataAlone();
     
 }
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 5e20ef9..fb21469 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -815,33 +815,33 @@
 		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoListInPageAlone(page, memberEntity);
 		//USDT充币总额+USDT提币总额
     	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataAlone();
-    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealData();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataAlone();
     	//USDT充值总额+USDT提现总额
-    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealData();
-    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealData();
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataAlone();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataAlone();
 		//佣金
-		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealData();
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataAlone();
 		//开仓手续费总额
-		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataAlone();
 		//平仓总手续费
-		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataAlone();
 		
 		//总盈亏
-		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataAlone();
 		
 		//持仓人数
-		String notNullNumber = memberMapper.selectSFCCForBasicRealData();
+		String notNullNumber = memberMapper.selectSFCCForBasicRealDataAlone();
 		//币币账户不为空的人数
-		String walletNumber = memberMapper.selectBBZHForBasicRealData();
+		String walletNumber = memberMapper.selectBBZHForBasicRealDataAlone();
 		//合约账户不为空的人数
-		String walletCoinNumber = memberMapper.selectHYZHForBasicRealData();
+		String walletCoinNumber = memberMapper.selectHYZHForBasicRealDataAlone();
 		//持仓手续费
-		String doingPrice = memberMapper.selectprepriceForBasicRealData();
+		String doingPrice = memberMapper.selectprepriceForBasicRealDataAlone();
 		
 		//账户金额
-		String walletNum = memberMapper.selectBBZCForBasicRealData();
-		String walletCoinNum = memberMapper.selectHYZCForBasicRealData();
-		String agentNum = memberMapper.selectDLZCForBasicRealData();
+		String walletNum = memberMapper.selectBBZCForBasicRealDataAlone();
+		String walletCoinNum = memberMapper.selectHYZCForBasicRealDataAlone();
+		String agentNum = memberMapper.selectDLZCForBasicRealDataAlone();
 		
 		double platformProfitAndLoss = 0 ;
 		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 3581863..8c004cc 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -101,6 +101,9 @@
 	<select id="selectMemberDataInfoDtoListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberDataInfoVo">
 		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>
 	
 	<select id="selectTotalAmountUsdtBForBasicRealDataBymemberId" resultType="java.lang.String">
 		SELECT
@@ -127,6 +130,16 @@
 				account_type = '2'
 			AND account_status = '1'
 		)
+	</select>
+	<select id="selectTotalAmountUsdtBForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(s.amount),'0')  as amount
+		FROM
+			member_coin_charge s
+		LEFT JOIN member m ON m.id = s.member_id
+		where 
+			s.symbol = 'USDT'
+		AND FIND_IN_SET('22015141', m.referer_ids)
 	</select>
 	<select id="selectTotalAmountUsdtBForBasicData" resultType="java.lang.String">
 		SELECT
@@ -162,6 +175,18 @@
 				account_type = '2'
 			AND account_status = '1'
 		)
+	</select>
+	<select id="selectTotalAmountUsdtSForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.amount),'0') as amount
+		FROM
+			member_coin_withdraw a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a. STATUS = 2
+		AND a.is_inside = 'N'
+		AND FIND_IN_SET('22015141', m.referer_ids)
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicData" resultType="java.lang.String">
 		SELECT
@@ -201,6 +226,17 @@
 			AND account_status = '1'
 		)
 	</select>
+	<select id="selectTotalAmountUsdtCZForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(amount_usdt),'0')
+		FROM
+			member_quick_buy_sale a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.order_type = 'B'
+		AND a.order_status = 3
+		AND FIND_IN_SET('22015141', m.referer_ids)
+	</select>
 	<select id="selectTotalAmountUsdtCZForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(amount_usdt),'0')
@@ -238,6 +274,17 @@
 			AND account_status = '1'
 		)
 	</select>
+	<select id="selectTotalAmountUsdtTXForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(amount_usdt),'0')
+		FROM
+			member_quick_buy_sale a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.order_type = 'S'
+		AND a.order_status = 2
+		AND FIND_IN_SET('22015141', m.referer_ids)
+	</select>
 	<select id="selectTotalAmountUsdtTXForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(amount_usdt),'0')
@@ -268,6 +315,19 @@
 		AND s.content LIKE '%佣金到账%'
 		AND s. STATUS = '1'
 	</select>
+	<select id="selectReturnMoneyForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(s.amount), '0')
+		FROM
+			member_account_money_change s
+			
+		LEFT JOIN member m ON m.id = s.member_id
+		WHERE
+			s.type = 3
+		AND s.content LIKE '%佣金到账%'
+		AND s. STATUS = '1'
+		AND FIND_IN_SET('22015141', m.referer_ids)
+	</select>
 	<select id="selectClosingpriceForBasicRealDataBymemberId" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(a.opening_fee_amount),'0')
@@ -295,6 +355,18 @@
 				account_type = '2'
 			AND account_status = '1'
 		)
+	</select>
+	<select id="selectClosingpriceForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.opening_fee_amount),'0')
+		FROM
+			contract_order a
+
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+		a.closing_type = '0'
+		and a.order_status = '1'
+		AND FIND_IN_SET('22015141', m.referer_ids)
 	</select>
 	<select id="selectClosingpriceForBasicData" resultType="java.lang.String">
 		SELECT
@@ -333,6 +405,18 @@
 			AND account_status = '1'
 		)
 	</select>
+	<select id="selectSellClosingpriceForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.closing_fee_amount),'0')
+		FROM
+			contract_order a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		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)
+	</select>
 	<select id="selectSellClosingpriceForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(a.closing_fee_amount),'0')
@@ -369,6 +453,17 @@
 				account_type = '2'
 			AND account_status = '1'
 		)
+	</select>
+	<select id="selectRewardratioForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.reward_amount), '0')
+		FROM
+			contract_order a
+		LEFT JOIN member m ON m.id = a.member_id
+		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);
 	</select>
 	<select id="selectRewardratioForBasicData" resultType="java.lang.String">
 		SELECT
@@ -411,6 +506,29 @@
 					s.member_id
 			) b
 	</select>
+	<select id="selectSFCCForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			COUNT(b.id)
+		FROM
+			(
+				SELECT
+					s.id
+				FROM
+					contract_hold_order s
+				WHERE
+					s.member_id IN (
+						SELECT
+							id
+						FROM
+							member
+						WHERE
+							account_type = '1'
+							AND FIND_IN_SET('22015141',referer_ids)
+					)
+				GROUP BY
+					s.member_id
+			) b
+	</select>
 	<select id="selectSFCCForBasicData" resultType="java.lang.String">
 		SELECT
 			COUNT(b.id)
@@ -442,6 +560,17 @@
 			AND account_status = '1'
 		)
 	</select>
+	<select id="selectBBZHForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			COUNT(a.id)
+		FROM
+			member_wallet_coin a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.wallet_code = 'USDT'
+		AND a.available_balance > 1
+		AND FIND_IN_SET('22015141', m.referer_ids)
+	</select>
 	<select id="selectBBZHForBasicData" resultType="java.lang.String">
 		SELECT
 			COUNT(a.id)
@@ -468,6 +597,18 @@
 				account_type = '2'
 			AND account_status = '1'
 		)
+	</select>
+	<select id="selectHYZHForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			COUNT(a.id)
+		FROM
+			member_wallet_contract a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.wallet_code = 'USDT'
+		AND a.total_balance > 1
+		AND FIND_IN_SET('22015141', m.referer_ids);
 	</select>
 	<select id="selectHYZHForBasicData" resultType="java.lang.String">
 		SELECT
@@ -502,6 +643,14 @@
 				AND account_status = '1'
 			)
 	</select>
+	<select id="selectprepriceForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.hold_amount),'0')
+		FROM
+			contract_order a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE FIND_IN_SET('22015141', m.referer_ids);
+	</select>
 	<select id="selectprepriceForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(a.hold_amount),'0')
@@ -533,6 +682,16 @@
 				account_type = '2'
 			AND account_status = '1'
 		)
+	</select>
+	<select id="selectBBZCForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(available_balance),'0')
+		FROM
+			member_wallet_coin a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.wallet_code = 'USDT'
+		AND FIND_IN_SET('22015141', m.referer_ids);
 	</select>
 	<select id="selectBBZCForBasicData" resultType="java.lang.String">
 		SELECT
@@ -566,6 +725,15 @@
 				AND account_status = '1'
 			)
 	</select>
+	<select id="selectHYZCForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(total_balance),'0')
+		FROM
+			member_wallet_contract a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE FIND_IN_SET('22015141', m.referer_ids);
+	</select>
 	<select id="selectHYZCForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(total_balance),'0')
@@ -596,6 +764,15 @@
 				AND account_status = '1'
 			)
 	</select>
+	<select id="selectDLZCForBasicRealDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(total_balance),'0')
+		FROM
+			member_wallet_agent a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE FIND_IN_SET('22015141', m.referer_ids);
+	</select>
 	<select id="selectDLZCForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(total_balance),'0')

--
Gitblit v1.9.1