From 1b0e20f11a920ba8c0c38e4c8fef58e8fa1fe0d2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jul 2020 19:41:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 117cc19..c480514 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
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
-import com.xcong.excoin.modules.contract.parameter.dto.ChangeBondDto;
-import com.xcong.excoin.modules.contract.parameter.dto.ProfitOrLessDto;
-import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
+import com.xcong.excoin.modules.contract.parameter.dto.*;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import org.apache.ibatis.annotations.Param;
@@ -24,14 +22,26 @@
public void updateOrderIsCanClosingAndBatchNoById(Long id);
- public Result findHoldOrderList();
+ public Result findHoldOrderList(String symbol);
public Result cancelHoldOrder(Long id);
- public Result cancelHoldOrderBatch();
+ public Result cancelHoldOrderBatch(SymbolDto symbolDto);
public Result setTargetProfitOrLess(ProfitOrLessDto profitOrLessDto);
public Result changeBond(ChangeBondDto changeBondDto);
+ public Result findContractMoneyInfo(String symbol);
+
+ public Result changeLeverRate(ChangeLeverRateDto changeLeverRateDto);
+
+ public Result findHoldOrderDetailById(Long id);
+
+ public Result findOrderList(OrderListDto orderListDto);
+
+ public Result findOrderDetailById(Long id);
+
+ public void calHoldOrderHoldFeeAmount();
+
}
--
Gitblit v1.9.1