From 8d3774e6d2440690348dc7fb6fcb6c1a53236255 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 07 Sep 2020 17:43:06 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 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 1fa881b..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,18 +3,17 @@ 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.*; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,14 +35,36 @@ @ApiOperation(value = "合约提交委托订单", notes = "提交委托订单") @PostMapping(value = "/submitEntrustOrder") public Result submitEntrustOrder(@RequestBody @Validated SubmitEntrustDto submitEntrustDto) { - if (StrUtil.isBlank(SymbolEnum.getNameByValue(submitEntrustDto.getSymbol()))){ - return Result.fail("非法币种"); + if (StrUtil.isBlank(SymbolEnum.getNameByValue(submitEntrustDto.getSymbol()))) { + return Result.fail(MessageSourceUtils.getString("illegal_symbol")); } if (!TypeJudgeUtils.entrustType(submitEntrustDto.getEntrustType())) { - return Result.fail("非法类型"); + return Result.fail(MessageSourceUtils.getString("illegal_type")); } - return Result.ok("123"); + return contractEntrustOrderService.addContractEntrustOrder(submitEntrustDto); + } + + @ApiOperation(value = "获取当前委托单列表", notes = "获取当前委托单列表") + @ApiResponses({ + @ApiResponse(code = 0, message = "success", response = ContractEntrustVo.class) + }) + @GetMapping(value = "/findCurrentEntrustOrderList") + public Result findCurrentEntrustOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) { + return contractEntrustOrderService.findEntrustOrderList(symbol); + } + + + @ApiOperation(value = "撤销委托单", notes = "撤销委托单") + @GetMapping(value = "/cancelEntrustOrder") + 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