From 83dab684cb4db66e67d8d08adb2d6e05277a5e9b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 11:10:02 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index fca4232..5f74494 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -2,6 +2,8 @@
 
 import com.xcong.excoin.common.LoginUserUtils;
 import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
 import com.xcong.excoin.modules.contract.parameter.dto.*;
 import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
 import com.xcong.excoin.modules.contract.parameter.vo.HoldOrderListVo;
@@ -76,6 +78,14 @@
     @ApiOperation(value = "一键平仓")
     @PostMapping(value = "/oneKeyClosing")
     public Result oneKeyClosing(@RequestBody SymbolDto symbolDto) {
+        symbolDto.setType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
+        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
+    }
+
+    @ApiOperation(value = "带单一键平仓")
+    @PostMapping(value = "/oneKeyClosingForFollow")
+    public Result oneKeyClosingForFollow(@RequestBody SymbolDto symbolDto) {
+        symbolDto.setType(ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY);
         return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
     }
 
@@ -127,6 +137,13 @@
         return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
     }
 
+    @ApiOperation(value = "全仓模式 - 一键平仓")
+    @PostMapping(value = "/oneKeyClosingForWhole")
+    public Result oneKeyClosingForWhole() {
+        SymbolDto symbolDto = new SymbolDto();
+        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
+    }
+
     @ApiOperation(value = "全仓模式 - 变更仓位类型")
     @GetMapping(value = "/changePositionType")
     public Result changePositionType() {

--
Gitblit v1.9.1