From 1356cf874d0fac038269d4277afea86d285dd623 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 13 Aug 2020 10:53:36 +0800 Subject: [PATCH] add table member_setting and change some column to member_setting --- src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 17 ++++++++++------- 1 files changed, 10 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..7d1430b 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 @@ -4,12 +4,12 @@ import com.xcong.excoin.common.enumerates.SymbolEnum; import com.xcong.excoin.common.response.Result; 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 +35,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); } -- Gitblit v1.9.1