From 805da278f9719a355b3d730ef894708086d27270 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Sep 2020 10:08:43 +0800
Subject: [PATCH] Merge branch 'master' into whole
---
src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java | 12 +++++++++++-
1 files changed, 11 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 dd1f6ac..aecc049 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
@@ -4,7 +4,9 @@
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import org.apache.ibatis.annotations.Param;
+import org.web3j.abi.datatypes.Int;
+import java.util.HashMap;
import java.util.List;
/**
@@ -36,7 +38,7 @@
public List<ContractHoldOrderEntity> selectHoldOrderListByMemberId(@Param("memberId") Long memberId);
- public List<ContractHoldOrderEntity> selectHoldOrderListByMemberIdAndSymbol(@Param("memberId") Long memberId, @Param("symbol") String symbol);
+ public List<ContractHoldOrderEntity> selectHoldOrderListByMemberIdAndSymbol(@Param("memberId") Long memberId, @Param("symbol") String symbol, @Param("type") Integer type);
public ContractHoldOrderEntity selectHoldOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id);
@@ -44,4 +46,12 @@
public List<ContractHoldOrderEntity> selectAllHoldOrder();
+ public List<ContractHoldOrderEntity> selectMemberHoldOrderByPositionType(@Param("positionType") Integer positionType, @Param("memberId") Long memberId);
+
+ 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<HashMap<String, Object>> selectAllWholeOrderMemberIdAndSymbol();
+
}
--
Gitblit v1.9.1