From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
index 9294a72..a9efce4 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
@@ -22,9 +22,11 @@
public void updateOrderIsCanClosingAndBatchNoById(Long id);
- public Result findHoldOrderList(String symbol);
+ public Result findHoldOrderList(String symbol, int type);
public Result cancelHoldOrder(Long id);
+
+ public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto);
public Result cancelHoldOrderBatch(SymbolDto symbolDto);
@@ -42,4 +44,8 @@
public Result findOrderDetailById(Long id);
+ public void calHoldOrderHoldFeeAmount();
+
+ public Result changePositionType();
+
}
--
Gitblit v1.9.1