From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' 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