From f96f41f814f976073e582588d1e23fa84dae7951 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jul 2020 11:07:07 +0800
Subject: [PATCH] 20200724 代码提交
---
src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
index 549ade7..8301cc9 100644
--- a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
@@ -23,6 +23,9 @@
<if test="record.account!=null and record.account!=''">
and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
</if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
</if>
</where>
ORDER BY s.create_time DESC
@@ -45,7 +48,35 @@
LEFT JOIN member m ON m.id = s.member_id
<where>
s.type = 3
- and (FIND_IN_SET('22015141', m.referer_ids) or m.id in (10))
+ and (FIND_IN_SET('22015141', m.referer_ids) or m.id in (8,10))
+ and s.content like '%佣金到账%'
+ <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})
+ </if>
+ </if>
+ </where>
+ ORDER BY s.create_time DESC
+ </select>
+
+ <select id="findMemberAgentReturnInfoAloneTestInPage" resultType="com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity">
+ SELECT
+ m.phone,
+ m.email,
+ m.invite_id inviteId,
+ s.member_id,
+ s.symbol,
+ s.amount,
+ s.content,
+ s.create_time createTime,
+ s. STATUS,
+ s.type
+ FROM
+ member_account_money_change s
+ LEFT JOIN member m ON m.id = s.member_id
+ <where>
+ s.type = 3
+ and (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10)
and s.content like '%佣金到账%'
<if test="record != null" >
<if test="record.account!=null and record.account!=''">
--
Gitblit v1.9.1