From 829f629756e5402bcd3e9f6ef1f9c6dbffbabb11 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 17 Apr 2024 14:46:29 +0800
Subject: [PATCH] 55测试环境

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 822744f..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;
@@ -43,9 +45,13 @@
     @ApiResponses({
             @ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
     })
+//    @GetMapping(value = "/findHoldOrderList")
+//    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+//        return contractHoldOrderService.findHoldOrderList(symbol, 1);
+//    }
     @GetMapping(value = "/findHoldOrderList")
-    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
-        return contractHoldOrderService.findHoldOrderList(symbol, 1);
+    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol") String symbol) {
+    	return contractHoldOrderService.findHoldOrderList(symbol, 1);
     }
 
     @ApiOperation(value = "查询当前持仓跟单订单列表 -- 轮询")
@@ -72,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);
     }
 
@@ -123,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