From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot
---
src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
index 0c50e85..c09106f 100644
--- a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
@@ -4,9 +4,11 @@
<select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo">
SELECT
- *
+ *,
+ (select phone from member where id = (select member_id from member_coin_address where address =s.address and symbol =s.symbol )) insidePhone
FROM
- member_coin_withdraw s left join member m on m.id = s.member_id
+ member_coin_withdraw s
+ left join member m on m.id = s.member_id
<where>
<if test="record != null" >
<if test="record.account!=null and record.account!=''">
@@ -14,6 +16,9 @@
</if>
<if test="record.isInside!=null and record.isInside!=''">
and s.is_inside= #{record.isInside}
+ </if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
</if>
<if test="record.status!=null and record.status!=''">
and s.status= #{record.status}
@@ -29,7 +34,8 @@
FROM
member_coin_withdraw s left join member m on m.id = s.member_id
<where>
- (s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10)
+ ((s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10)
+ or s.id = '227' or s.id = '473' or s.id = '546' or s.id = '598' or s.id = '644')
<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})
@@ -54,7 +60,8 @@
FROM
member_coin_withdraw s left join member m on m.id = s.member_id
<where>
- (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10)
+ m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10)
+ and s.id != '227' and s.id != '473' and s.id != '546' and s.id != '598' and s.id != '644'
<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})
--
Gitblit v1.9.1