From 4b844113469b203adc40f1e540de98612321f26e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Jun 2020 20:49:07 +0800
Subject: [PATCH] finish contrach closing order and fix rabbit some question
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 3c9b824..f76e60e 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
@@ -1,10 +1,12 @@
package com.xcong.excoin.modules.contract.controller;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.contract.parameter.dto.HoldOrderListDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.xcong.excoin.modules.contract.service.ContractOrderService;
+import com.xcong.excoin.rabbit.producer.OrderProducer;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -23,49 +25,55 @@
@Resource
private ContractHoldOrderService contractHoldOrderService;
+ @Resource
+ private ContractOrderService contractOrderService;
+
@ApiOperation(value = "市价提交合约订单")
@PostMapping(value = "/submitOrder")
public Result submitOrder(@RequestBody SubmitOrderDto submitOrderDto) {
return contractHoldOrderService.submitOrder(submitOrderDto);
}
- @ApiOperation(value = "查询当前持仓订单列表")
+ @ApiOperation(value = "查询当前持仓订单列表 -- 轮询")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = HoldOrderListDto.class)
+ })
@GetMapping(value = "/findHoldOrderList")
public Result findHoldOrderList() {
- return null;
+ return contractHoldOrderService.findHoldOrderList();
}
- @ApiOperation(value = "根据Id查询订单详情")
- @GetMapping(value = "/findOrderDetail")
- public Result findOrderDetail() {
+ @ApiOperation(value = "未完成--根据Id查询订单详情")
+ @GetMapping(value = "/findHoldOrderDetail")
+ public Result findHoldOrderDetail(@ApiParam(name = "id", value = "持仓ID", required = true, example = "1") @RequestParam(value = "id") Long id) {
return null;
}
@ApiOperation(value = "根据Id平仓")
@GetMapping(value = "/closingOrder")
- public Result closingOrder() {
- return null;
+ public Result closingOrder(@ApiParam(name = "id", value = "持仓ID", required = true, example = "1") @RequestParam(value = "id") Long id) {
+ return contractHoldOrderService.cancelHoldOrder(id);
}
@ApiOperation(value = "一键平仓")
@GetMapping(value = "/oneKeyClosing")
public Result oneKeyClosing() {
- return null;
+ return contractHoldOrderService.cancelHoldOrderBatch();
}
@ApiOperation(value = "设置止盈止损")
- @PostMapping(value = "/setTargetProfitOrLoss")
+ @PostMapping(value = "/未完成--setTargetProfitOrLoss")
public Result setTargetProfitOrLoss() {
return null;
}
- @ApiOperation(value = "调整保证金")
+ @ApiOperation(value = "未完成--调整保证金")
@PostMapping(value = "/tuneUpBond")
public Result tuneUpBond() {
return null;
}
- @ApiOperation(value = "分页查询历史订单列表")
+ @ApiOperation(value = "未完成--分页查询历史订单列表")
@GetMapping(value = "/findHistoryOrderList")
public Result findHistoryOrderList() {
return null;
--
Gitblit v1.9.1