From 17b569ed8554e755c9e5feedf6e7882cdf2c8d01 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 16:48:27 +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, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index d3c6b83..952f2a7 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -5,8 +5,7 @@
<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 '%转%' 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")) )
+ and (content like '%转%' or content like '%收款%')
order by create_time desc
</select>
@@ -64,7 +63,7 @@
<if test="record != null">
<where>
type = 3
- and (content like '%佣金到账%' or content like '%活动%' or 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