From a49c30e1b41eb66098d7e0f067cc51746f1eaed9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 10 Aug 2020 15:06:22 +0800
Subject: [PATCH] Merge branch 'follow' into whole
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 0be9cc1..5edbdec 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
@@ -43,7 +43,16 @@
})
@GetMapping(value = "/findHoldOrderList")
public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
- return contractHoldOrderService.findHoldOrderList(symbol);
+ return contractHoldOrderService.findHoldOrderList(symbol, 1);
+ }
+
+ @ApiOperation(value = "查询当前持仓跟单订单列表 -- 轮询")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
+ })
+ @GetMapping(value = "/findHoldFollowOrderList")
+ public Result findHoldFollowOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+ return contractHoldOrderService.findHoldOrderList(symbol, 2);
}
@ApiOperation(value = "根据Id查询持仓订单详情")
@@ -106,4 +115,10 @@
return contractHoldOrderService.findOrderDetailById(id);
}
+ @ApiOperation(value = "全仓模式平仓")
+ @PostMapping(value = "/closingOrder")
+ public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) {
+ return null;
+ }
+
}
--
Gitblit v1.9.1