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 | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 42ca424..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
@@ -129,7 +131,7 @@
and m.account_type= #{record.isTest}
</if>
</where>
- order by m.create_time desc
+ order by a.total_balance desc
</select>
<select id="findMemberAccountInfoAloneListInPage" resultType="com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo">
@@ -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">
@@ -356,15 +358,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')
+ 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 +393,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 = '227')
+ 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 +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">
@@ -1457,4 +1474,33 @@
select id from member where invite_id = #{inviteId}
</select>
+ <select id="selectMemberDataInfoListSearchs" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+ SELECT
+ *
+ FROM
+ member where FIND_IN_SET(#{inviteId}, referer_ids)
+ </select>
+
+ <select id="selectMemberByInviteId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+ SELECT
+ *
+ FROM
+ member m where m.invite_id = #{inviteId}
+ </select>
+
+ <select id="selectDataInfoListSearchs" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+ SELECT
+ *
+ FROM
+ member m
+ <where>
+ <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})
+ </if>
+ </if>
+ </where>
+ order by m.create_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1