From 17b12b82967c65d170b7bda3c79e3aa76ecfa746 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 Aug 2020 14:48:59 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

---
 src/main/resources/mapper/contract/ContractHoldOrderDao.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
index 674ff11..463ccbf 100644
--- a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
@@ -52,13 +52,17 @@
     <select id="selectMemberHoldOrderByPositionType" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
         select * from contract_hold_order
         where position_type=#{positionType} and is_can_closing=1 and member_id=#{memberId}
-        <if test="orderType != null">
-            order_type=#{orderType}
-        </if>
     </select>
 
     <select id="selectWholeHoldOrderByOrderType" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
         select * from contract_hold_order
-        where member_id=#{memberId} and order_type=#{OrderType}
+        where member_id=#{memberId} and opening_type=#{orderType} and symbol=#{symbol}
+    </select>
+
+    <select id="selectHoldOrderListForWholeByMemberIdAndSymbol" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
+        select * from contract_hold_order where member_id=#{memberId}
+        and symbol=#{symbol}
+        and position_type=2
+        order by create_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1