From a00d810984fe187d24e442d5f557bcc271cfa3ce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 Jan 2021 11:25:49 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new

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

diff --git a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
index 674ff11..45c0994 100644
--- a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
@@ -52,13 +52,54 @@
     <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}
+        <if test="symbol != null  and symbol != ''">
+            and symbol=#{symbol}
+        </if>
+        and position_type=2
+        order by create_time desc
+    </select>
+
+    <select id="selectAllWholeOrderMemberIdAndSymbol" resultType="java.util.HashMap">
+        select
+            member_id,
+            symbol
+        from contract_hold_order
+        where position_type=2
+        group by member_id, symbol
+    </select>
+
+    <select id="selectWholeHoldOrderSymbolsByMemberId" resultType="java.lang.String">
+        select distinct symbol
+        from contract_hold_order
+        where position_type=2 and member_id=#{memberId}
+    </select>
+
+    <update id="updateForcePriceBySymbolAndMemberId">
+        update contract_hold_order
+        set force_closing_price=#{forcePrice}, is_can_closing=1
+        where member_id=#{memberId} and symbol=#{symbol}
+    </update>
+
+
+    <update id="updateMemberAllHoldOrderClosingStatus">
+        update contract_hold_order
+        set is_can_closing = 0
+        where member_id=#{memberId}
+    </update>
+
+    <select id="selectMemberHasWholeOrder" resultType="java.lang.Long">
+        select distinct member_id
+        from contract_hold_order
+        where position_type=2
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1