From 85a8ca034763c90625c2a6bf844c1d0656cd5591 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 11:30:43 +0800
Subject: [PATCH] 20200723 代码提交
---
src/main/resources/mapper/modules/ContractOrderMapper.xml | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index c3137f7..5e62689 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -49,7 +49,7 @@
order by s.opening_time desc
</select>
- <select id="findMemberHistoryOrderInfoAllInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">
+ <select id="findHistoryOrderInfoAloneInfoInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">
SELECT
*
FROM
@@ -57,7 +57,7 @@
LEFT JOIN member m ON m.id = s.member_id
<where>
s.closing_type in (2,3,4,5,6,7,8,9)
- and FIND_IN_SET('22015141', m.referer_ids)
+ and ( FIND_IN_SET('22015141', m.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})
@@ -65,6 +65,33 @@
<if test="record.closingType!=null and record.closingType!=''">
and s.closing_type = #{record.closingType}
</if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
+ </if>
+ </where>
+ order by s.opening_time desc
+ </select>
+
+ <select id="findhistoryOrderInfoAloneTestInfoInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">
+ SELECT
+ *
+ FROM
+ contract_order s
+ LEFT JOIN member m ON m.id = s.member_id
+ <where>
+ s.closing_type in (2,3,4,5,6,7,8,9)
+ and (s.member_id not 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})
+ </if>
+ <if test="record.closingType!=null and record.closingType!=''">
+ and s.closing_type = #{record.closingType}
+ </if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
</if>
</where>
order by s.opening_time desc
--
Gitblit v1.9.1