From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java b/src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java
index 0739581..8981af2 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java
@@ -6,6 +6,8 @@
import org.apache.ibatis.annotations.Param;
import org.web3j.abi.datatypes.Int;
+import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.List;
/**
@@ -38,6 +40,7 @@
public List<ContractHoldOrderEntity> selectHoldOrderListByMemberId(@Param("memberId") Long memberId);
public List<ContractHoldOrderEntity> selectHoldOrderListByMemberIdAndSymbol(@Param("memberId") Long memberId, @Param("symbol") String symbol, @Param("type") Integer type);
+ public List<ContractHoldOrderEntity> selectHoldOrderListByMemberIdAndSymbolTest(@Param("memberId") Long memberId, @Param("type") Integer type);
public ContractHoldOrderEntity selectHoldOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id);
@@ -47,8 +50,17 @@
public List<ContractHoldOrderEntity> selectMemberHoldOrderByPositionType(@Param("positionType") Integer positionType, @Param("memberId") Long memberId);
- public ContractHoldOrderEntity selectWholeHoldOrderByOrderType(@Param("memberId") Long memberId, @Param("orderType") Integer orderType);
+ public ContractHoldOrderEntity selectWholeHoldOrderByOrderType(@Param("memberId") Long memberId, @Param("orderType") Integer orderType, @Param("symbol") String symbol);
public List<ContractHoldOrderEntity> selectHoldOrderListForWholeByMemberIdAndSymbol(@Param("memberId") Long memberId, @Param("symbol") String symbol);
+ public List<Long> selectAllWholeOrderMemberId();
+
+ public List<String> selectWholeHoldOrderSymbolsByMemberId(@Param("memberId") Long memberId);
+
+ public int updateForcePriceBySymbolAndMemberId(@Param("forcePrice") BigDecimal forcePrice, @Param("memberId") Long memberId, @Param("symbol") String symbol);
+
+ public List<Long> selectMemberHasWholeOrder();
+
+ int updateMemberAllHoldOrderClosingStatus(@Param("memberId") Long memberId);
}
--
Gitblit v1.9.1