From 71d0fae3ac7113f813a73fdbcd76a608fce30e38 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Jul 2020 15:50:33 +0800
Subject: [PATCH] 20200716 代码提交
---
src/main/resources/mapper/modules/ContractOrderMapper.xml | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index 175695c..cb2c8bb 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -9,7 +9,15 @@
contract_order s
LEFT JOIN member m ON m.id = s.member_id
<where>
- order_type in (3,4)
+ s.closing_type in (2,3,4,5,6,7,8,9)
+ AND 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})
@@ -18,8 +26,27 @@
and s.closing_type = #{record.closingType}
</if>
</if>
- </where>
- order by s.order_no DESC,s.create_time asc
+ </where>
+ order by s.opening_time desc
+ </select>
+ <select id="findMemberHistoryOrderInfoAllInPage" 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)
+ <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>
+ </where>
+ order by s.opening_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1