From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/resources/mapper/contract/ContractHoldOrderDao.xml | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
index d52e599..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
@@ -61,17 +70,44 @@
<select id="selectHoldOrderListForWholeByMemberIdAndSymbol" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
select * from contract_hold_order where member_id=#{memberId}
- and symbol=#{symbol}
+ <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 id="selectAllWholeOrderMemberId" resultType="java.lang.Long">
select
- member_id,
- symbol
+ member_id
+ from contract_hold_order
+ where position_type=2 and is_can_closing=1
+ group by member_id
+ </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
- group by member_id, symbol
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1