From bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 15:38:42 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index d17c724..d3c6b83 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>
@@ -63,7 +64,7 @@
<if test="record != null">
<where>
type = 3
- and content like '%佣金到账%'
+ and (content like '%佣金到账%' or content like '%活动%' or content like '%返利%')
<if test="record.memberId != null" >
and member_id=#{record.memberId}
</if>
--
Gitblit v1.9.1