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/MemberCoinWithdrawMapper.xml | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
index f4fd907..9bb9fcd 100644
--- a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
@@ -2,12 +2,27 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberCoinWithdrawMapper">
- <select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo">
- SELECT
- *
- FROM
- member_coin_withdraw s left join member m on m.id = s.member_id
+ <select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo"> SELECT
+ s.id,
+ s.create_time,
+ m.email,
+ m.phone,
+ s.member_id,
+ m.invite_id,
+ s.address,
+ s.amount,
+ s.fee_amount,
+ s.symbol,
+ s.status,
+ s.is_inside,
+ concat(auth.first_name,auth.second_name) as realName,
+ (select phone from member where id = (select member_id from member_coin_address where address =s.address and symbol =s.symbol and is_biyict=1)) insidePhone
+ FROM
+ member_coin_withdraw s
+ left join member m on m.id = s.member_id
+ left join member_authentication auth on auth.member_id = s.member_id
<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})
@@ -21,6 +36,9 @@
<if test="record.status!=null and record.status!=''">
and s.status= #{record.status}
</if>
+ <if test="record.insidePhone!=null and record.insidePhone!=''">
+ and #{record.insidePhone} in (select phone from member where id = (select member_id from member_coin_address where address =s.address and symbol =s.symbol and is_biyict=1))
+ </if>
</if>
</where>
order by s.create_time desc
@@ -33,7 +51,7 @@
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)
- or s.id = '227')
+ 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})
@@ -59,7 +77,7 @@
member_coin_withdraw s left join member m on m.id = s.member_id
<where>
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 != '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