From a667bd4f496cfd5ddd3647e0be82b0008e379fe8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 15:17:38 +0800
Subject: [PATCH] 20210304 最大持仓数设置0时，显示为空
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
index 59d3b69..05685f9 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
@@ -3,13 +3,14 @@
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.contract.parameter.dto.SubmitCloseEntrustDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
+import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
+import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.TypeJudgeUtils;
import com.xcong.excoin.utils.api.response.Symbol;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -35,20 +36,23 @@
@PostMapping(value = "/submitEntrustOrder")
public Result submitEntrustOrder(@RequestBody @Validated SubmitEntrustDto submitEntrustDto) {
if (StrUtil.isBlank(SymbolEnum.getNameByValue(submitEntrustDto.getSymbol()))) {
- return Result.fail("非法币种");
+ return Result.fail(MessageSourceUtils.getString("illegal_symbol"));
}
if (!TypeJudgeUtils.entrustType(submitEntrustDto.getEntrustType())) {
- return Result.fail("非法类型");
+ return Result.fail(MessageSourceUtils.getString("illegal_type"));
}
return contractEntrustOrderService.addContractEntrustOrder(submitEntrustDto);
}
@ApiOperation(value = "获取当前委托单列表", notes = "获取当前委托单列表")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = ContractEntrustVo.class)
+ })
@GetMapping(value = "/findCurrentEntrustOrderList")
- public Result findCurrentEntrustOrderList() {
- return contractEntrustOrderService.findEntrustOrderList();
+ public Result findCurrentEntrustOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+ return contractEntrustOrderService.findEntrustOrderList(symbol);
}
@@ -57,4 +61,10 @@
public Result cancelEntrustOrder(@ApiParam(name = "id", value = "委托单ID", required = true, example = "1") @RequestParam("id") Long id) {
return contractEntrustOrderService.cancelEntrustOrder(id);
}
+
+ @ApiOperation(value = "全仓模式 -- 提交平仓委托单", notes = "平仓委托单")
+ @PostMapping(value = "/submitCloseEntrustOrder")
+ public Result submitCloseEntrustOrder(@RequestBody SubmitCloseEntrustDto submitCloseEntrustDto) {
+ return contractEntrustOrderService.addCloseContractEntrustOrder(submitCloseEntrustDto);
+ }
}
--
Gitblit v1.9.1