From 5e75c6faae3a68ec672db2ca509a2de9f863d0b6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Jun 2021 15:11:42 +0800
Subject: [PATCH] 20210615  最新价

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

diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 92f6b6c..079d96c 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -4,7 +4,9 @@
 
     <select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
         SELECT
-			*
+			*,
+		(select available_balance+frozen_balance from member_wallet_coin where wallet_code='USDT' and member_id = m.id) usdtBalance,
+		(select available_balance+frozen_balance from member_wallet_coin where wallet_code='ROC' and member_id = m.id) rocBalance
 		FROM
 			member m
 		LEFT JOIN member_authentication a ON m.id = a.member_id
@@ -229,7 +231,7 @@
 		FROM
 			member_coin_charge a
 		WHERE
-			a.symbol = 'USDT'
+			a.symbol = #{symbol}
 		AND a.member_id = #{memberId}
 	</select>
 	<select id="selectTotalAmountUsdtBForBasicRealData" resultType="java.lang.String">
@@ -308,6 +310,7 @@
 		WHERE
 			a. STATUS = 2
 		AND a.member_id = #{memberId}
+		and a.symbol='USDT'
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicRealData" resultType="java.lang.String">
 		SELECT
@@ -356,15 +359,30 @@
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicRealTestAllDataAlone" resultType="java.lang.String">
 		SELECT
-			IFNULL(SUM(a.amount),'0') as amount
+			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 ((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')
+		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'
+		)
+		AND a.id != '598'
+		AND a.id != '644'
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicAllDataAlone" resultType="java.lang.String">
 		SELECT
@@ -376,7 +394,7 @@
 		WHERE
 			a. STATUS = 2
 		AND a.is_inside = 'N'
-		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')
+		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' or a.id = '645')
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicData" resultType="java.lang.String">
 		SELECT
@@ -1238,11 +1256,11 @@
 	</select>
 	<select id="selectBBZCForBasicRealDataBymemberId" resultType="java.lang.String">
 		SELECT
-			IFNULL(SUM(available_balance),'0')
+			IFNULL(SUM(available_balance+frozen_balance),'0')
 		FROM
 			member_wallet_coin
 		WHERE
-			wallet_code = 'USDT'
+			wallet_code = #{symbol}
 		AND member_id = #{memberId}
 	</select>
 	<select id="selectBBZCForBasicRealData" resultType="java.lang.String">

--
Gitblit v1.9.1