From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak
---
src/main/resources/mapper/modules/MemberMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 79fae0f..3127c4e 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">
@@ -377,9 +379,9 @@
)
OR a.id = '228'
OR a.id = '474'
- OR a.id = '644'
)
AND a.id != '598'
+ AND a.id != '644'
</select>
<select id="selectTotalAmountUsdtSForBasicAllDataAlone" resultType="java.lang.String">
SELECT
@@ -1253,11 +1255,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