From a8bc04c1c9270a2a7f28d6113bc6f097496c50aa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 14:40:25 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new

---
 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index d17c724..894e026 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -5,7 +5,8 @@
     <select id="coinInList" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
 		select * from member_account_money_change
             	where member_id = #{record.memberId}
-            	and content like '%转%'
+            	and (content like '%转%' or content like '%收款%' or (content like '%提币%' and withdraw_id in 
+            	(select id from member_coin_withdraw w where w.member_id = #{record.memberId} and is_inside = "Y")) )
         order by create_time desc
     </select>
 	

--
Gitblit v1.9.1