From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new

---
 src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java |    9 ++++++++-
 1 files changed, 8 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..bbcbbd8 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,9 @@
 
     public Result findOrderDetailById(Long id);
 
+    public void calHoldOrderHoldFeeAmount();
+
+    public Result changePositionType();
+    public void calHoldFeeAmountForBondAmount();
+
 }

--
Gitblit v1.9.1