From f3948fa31158c7b7dea3b038e01c43ce54c55a1c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 11:09:57 +0800
Subject: [PATCH] modify

---
 src/main/resources/mapper/contract/ContractHoldOrderDao.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
index 45c0994..6ce1798 100644
--- a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
@@ -2,6 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao">
 
+	<select id="selectHoldOrderListByMemberIdAndSymbolTest" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
+        select * from contract_hold_order where member_id=#{memberId}
+        <if test="type!=null and type!=0">
+            and contract_type=#{type}
+        </if>
+        and is_can_closing=1
+        order by create_time desc
+    </select>
+
     <update id="updateContractHoldOrderCanNotClosingByIds" parameterType="map">
         UPDATE contract_hold_order set is_can_closing = 0,batch_no=#{batchNo}
         where is_can_closing=1
@@ -68,13 +77,12 @@
         order by create_time desc
     </select>
 
-    <select id="selectAllWholeOrderMemberIdAndSymbol" resultType="java.util.HashMap">
+    <select id="selectAllWholeOrderMemberId" resultType="java.lang.Long">
         select
-            member_id,
-            symbol
+            member_id
         from contract_hold_order
-        where position_type=2
-        group by member_id, symbol
+        where position_type=2 and is_can_closing=1
+        group by member_id
     </select>
 
     <select id="selectWholeHoldOrderSymbolsByMemberId" resultType="java.lang.String">

--
Gitblit v1.9.1