From 044cb4aa5da2cf5928e3e36e4007a361cd88fb24 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 27 Jul 2020 10:46:56 +0800 Subject: [PATCH] 20200727 代码提交 --- src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml index 3df87e0..90df952 100644 --- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml +++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml @@ -12,6 +12,9 @@ <if test="record.address!=null and record.address!=''"> and s.address=#{record.address} </if> + <if test="record.isTest!=null and record.isTest!=''"> + and m.account_type= #{record.isTest} + </if> </if> </where> order by s.create_time desc @@ -20,7 +23,7 @@ <select id="findmemberApplyCoinAloneInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo"> select * from member_coin_charge s left join member m on m.id = s.member_id <where> - s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids)) + (s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10) <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}) @@ -28,6 +31,28 @@ <if test="record.address!=null and record.address!=''"> and s.address=#{record.address} </if> + <if test="record.isTest!=null and record.isTest!=''"> + and m.account_type= #{record.isTest} + </if> + </if> + </where> + order by s.create_time desc + </select> + + <select id="findMemberApplyCoinAloneTestInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo"> + select * from member_coin_charge s left join member m on m.id = s.member_id + <where> + m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10) + <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 test="record.address!=null and record.address!=''"> + and s.address=#{record.address} + </if> + <if test="record.isTest!=null and record.isTest!=''"> + and m.account_type= #{record.isTest} + </if> </if> </where> order by s.create_time desc -- Gitblit v1.9.1