From 77f844f85e90ee6ae98c5f9c3d24f31d541db2f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 01 Jul 2020 19:53:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/resources/mapper/contract/ContractOrderDao.xml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml
index d98a8d3..fc31d0e 100644
--- a/src/main/resources/mapper/contract/ContractOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractOrderDao.xml
@@ -4,8 +4,22 @@
 
 
     <select id="selectContractOrderInPage" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
-        select * from contract_order where member_id=#{memberId}
+        select * from contract_order
+        <if test="record != null">
+            <where>
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+                <if test="record.symbol != null and record.symbol != ''">
+                    and symbol = #{record.symbol}
+                </if>
+            </where>
+        </if>
         order by create_time desc
     </select>
 
+    <select id="selectOrderDetailByIdAndMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
+        select * from contract_order where id=#{id} and member_id=#{memberId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1