From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 20 +++++++++++++++++---
1 files changed, 17 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 bdd2674..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,13 @@
@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, 1);
+ public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol") String symbol) {
+ return contractHoldOrderService.findHoldOrderList(symbol, 1);
}
@ApiOperation(value = "查询当前持仓跟单订单列表 -- 轮询")
@@ -118,7 +124,7 @@
@ApiOperation(value = "全仓模式 - 平仓")
@PostMapping(value = "/closingOrder")
public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) {
- return null;
+ return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
}
@ApiOperation(value = "全仓模式 - 变更仓位类型")
@@ -127,4 +133,12 @@
return contractHoldOrderService.changePositionType();
}
+ @GetMapping(value = "/findPositionType")
+ @ApiModelProperty(value = "全仓模式 -- 获取仓位状态")
+ public Result findPositionType() {
+ MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+
+ return Result.ok("获取成功", memberEntity.getContractPositionType());
+ }
+
}
--
Gitblit v1.9.1