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/ContractHoldOrderEntityMapper.xml | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
index 1d18ba2..30d5d19 100644
--- a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
+++ b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
@@ -9,17 +9,12 @@
contract_hold_order s
LEFT JOIN member m ON m.id = s.member_id
<where>
- s.member_id IN (
- SELECT
- id
- FROM
- member
- WHERE
- account_type = '1'
- )
<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.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
</if>
</if>
</where>
@@ -33,7 +28,27 @@
contract_hold_order 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', m.referer_ids)) or m.id = 10)
+ ( 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})
+ </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="findContractHoldOrderAloneTestInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity">
+ SELECT
+ *
+ FROM
+ contract_hold_order 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})
--
Gitblit v1.9.1