From a7b8fd2b18e652730cd4e48da61adee89564b4b6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 Aug 2020 11:08:10 +0800
Subject: [PATCH] merge master
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 4593860..89614aa 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.*;
import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
import com.xcong.excoin.modules.contract.parameter.vo.HoldOrderListVo;
+import com.xcong.excoin.modules.contract.parameter.vo.OrderListVo;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.contract.service.ContractOrderService;
import com.xcong.excoin.rabbit.producer.OrderProducer;
@@ -42,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查询持仓订单详情")
@@ -75,10 +85,13 @@
return contractHoldOrderService.changeBond(changeBondDto);
}
- @ApiOperation(value = "未完成--分页查询历史订单列表")
- @GetMapping(value = "/findHistoryOrderList")
+ @ApiOperation(value = "分页查询历史订单列表")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = OrderListVo.class)
+ })
+ @PostMapping(value = "/findHistoryOrderList")
public Result findHistoryOrderList(@RequestBody @Validated OrderListDto orderListDto) {
- return null;
+ return contractHoldOrderService.findOrderList(orderListDto);
}
@ApiOperation(value = "获取合约页面资产信息")
@@ -91,9 +104,27 @@
}
@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);
+ }
+
+ @ApiOperation(value = "全仓模式 - 平仓")
+ @PostMapping(value = "/closingOrder")
+ public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) {
+ return Result.ok("平仓成功");
+ }
+
+ @ApiOperation(value = "全仓模式 - 变更仓位类型")
+ @GetMapping(value = "/changePositionType")
+ public Result changePositionType() {
+ return contractHoldOrderService.changePositionType();
+ }
+
}
--
Gitblit v1.9.1