From 41a5e33865a5fa32249d74b443d3f05b571111b6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Mar 2021 11:21:26 +0800
Subject: [PATCH] 20210304 跟单只允许跟一个交易员
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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..fca4232 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,5 +1,6 @@
package com.xcong.excoin.modules.contract.controller;
+import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.contract.parameter.dto.*;
import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
@@ -7,6 +8,7 @@
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.modules.member.entity.MemberEntity;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -41,9 +43,22 @@
@ApiResponses({
@ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
})
+// @GetMapping(value = "/findHoldOrderList")
+// public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+// return contractHoldOrderService.findHoldOrderList(symbol, 1);
+// }
@GetMapping(value = "/findHoldOrderList")
- public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
- return contractHoldOrderService.findHoldOrderList(symbol);
+ public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol") String 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 +110,35 @@
}
@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 contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+ }
+
+ @ApiOperation(value = "全仓模式 - 变更仓位类型")
+ @GetMapping(value = "/changePositionType")
+ public Result changePositionType() {
+ return contractHoldOrderService.changePositionType();
+ }
+
+ @GetMapping(value = "/findPositionType")
+ @ApiModelProperty(value = "全仓模式 -- 获取仓位状态")
+ public Result findPositionType() {
+ MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+
+ return Result.ok("获取成功", memberEntity.getContractPositionType());
+ }
+
}
--
Gitblit v1.9.1