From 6cb72d1fda923f2f4964df8efc56452c0d3d084a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Jun 2020 11:36:38 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 1449ba9..3a8a0a6 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
@@ -4,6 +4,7 @@
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.SymbolDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
import com.xcong.excoin.modules.contract.parameter.vo.HoldOrderListVo;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
@@ -43,8 +44,8 @@
@ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
})
@GetMapping(value = "/findHoldOrderList")
- public Result findHoldOrderList() {
- return contractHoldOrderService.findHoldOrderList();
+ public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+ return contractHoldOrderService.findHoldOrderList(symbol);
}
@ApiOperation(value = "未完成--根据Id查询订单详情")
@@ -60,9 +61,9 @@
}
@ApiOperation(value = "一键平仓")
- @GetMapping(value = "/oneKeyClosing")
- public Result oneKeyClosing() {
- return contractHoldOrderService.cancelHoldOrderBatch();
+ @PostMapping(value = "/oneKeyClosing")
+ public Result oneKeyClosing(@RequestBody SymbolDto symbolDto) {
+ return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
}
@ApiOperation(value = "设置止盈止损")
--
Gitblit v1.9.1