From 0f5831b3827cd58a3ca612fa5c53d98470e4a268 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 11:29:45 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 19 +++++++++++++++++--
1 files changed, 17 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 75b6fbe..1ce9e3d 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查询持仓订单详情")
@@ -95,9 +104,15 @@
}
@ApiOperation(value = "调整杠杆")
- @GetMapping(value = "/changeLeverRate")
+ @PostMapping(value = "/changeLeverRate")
public Result changeLeverRate(@RequestBody @Validated ChangeLeverRateDto changeLeverRateDto) {
return contractHoldOrderService.changeLeverRate(changeLeverRateDto);
}
+ @ApiOperation(value = "查询历史委托订单详情")
+ @GetMapping(value = "/findOrderDetailById")
+ public Result findOrderDetailById(@ApiParam(name = "id", value = "订单id", required = true, example = "1") @RequestParam(value = "id") Long id) {
+ return contractHoldOrderService.findOrderDetailById(id);
+ }
+
}
--
Gitblit v1.9.1