From 2dd3a086f2edeb9f364935c3fb98f18c2eea2fa8 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 27 May 2020 15:33:23 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 46 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java index e24da80..b505e06 100644 --- a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java +++ b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java @@ -5,25 +5,30 @@ import javax.annotation.Resource; import javax.validation.Valid; +import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeVo; +import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo; +import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo; +import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo; +import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletContractInfoVo; + +import io.swagger.annotations.*; import org.springframework.web.bind.annotation.GetMapping; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.xcong.excoin.common.response.Result; import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceDto; +import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceFromAgentDto; import com.xcong.excoin.modules.coin.service.CoinService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @Slf4j @Api(value = "会员资产接口", tags = "会员资产接口") @RestController -@RequestMapping(value = "/api/coin") +@RequestMapping(value = "/api/walletCoin") public class CoinController { @Resource @@ -34,6 +39,7 @@ * @return */ @ApiOperation(value = "获取我的币币账户信息", notes = "获取我的币币账户信息") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletCoinVo.class)}) @GetMapping(value = "/getWalletCoin") public Result getWalletCoin() { return coinService.getWalletCoin(); @@ -44,9 +50,13 @@ * @return */ @ApiOperation(value="获取币币账户某个币种信息", notes="获取币币账户某个币种信息") - @GetMapping(value = "/getWalletCoinById") - public Result getWalletCoinById(@RequestParam("id") Long id) { - return coinService.getWalletCoinById(id); + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletCoinInfoVo.class)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query") + }) + @GetMapping(value = "/getWalletCoinBySymbol") + public Result getWalletCoinBySymbol(String symbol) { + return coinService.getWalletCoinBySymbol(symbol); } /** @@ -55,6 +65,7 @@ * @return */ @ApiOperation(value="获取我的合约账户信息", notes="获取我的合约账户信息") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletContractInfoVo.class)}) @GetMapping(value="/getWalletContractById") public Result getWalletContractById() { return coinService.getWalletContractById(); @@ -75,6 +86,9 @@ * @return */ @ApiOperation(value="查询币币账户里面的可用资产余额", notes="查询币币账户里面的可用资产余额") + @ApiImplicitParams({ + @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query") + }) @GetMapping(value="/findWalletCoinBySymbol") public Result findWalletCoinBysymbol(String symbol) { return coinService.findWalletCoinBySymbol(symbol); @@ -84,7 +98,8 @@ * 查询代理账户里面的资产余额 * @return */ - @ApiOperation(value="查询代理账户里面的可用资产余额", notes="查询代理账户里面的可用资产余额") + @ApiOperation(value="查询代理账户信息", notes="查询代理账户信息") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletAgentInfoVo.class)}) @GetMapping(value="/findWalletAgentBySymbol") public Result findWalletAgentBySymbol() { return coinService.findWalletAgentBySymbol(); @@ -95,6 +110,7 @@ * @return */ @ApiOperation(value="获取币币资产交易记录", notes="获取币币资产交易记录") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)}) @GetMapping(value="/getWalletCoinRecords") public Result getWalletCoinRecords() { return coinService.getWalletCoinRecords(); @@ -105,9 +121,10 @@ * @return */ @ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)}) @GetMapping(value="/getWalletContractRecords") - public Result getWalletContractRecords(String symbol) { - return coinService.getWalletContractRecords(symbol); + public Result getWalletContractRecords() { + return coinService.getWalletContractRecords(); } /** @@ -115,6 +132,7 @@ * @return */ @ApiOperation(value="获取代理资产交易记录", notes="获取代理资产交易记录") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)}) @GetMapping(value="/getWalletAgentRecords") public Result getWalletAgentRecords() { return coinService.getWalletAgentRecords(); @@ -148,11 +166,11 @@ * 代理账户划转到USDT账户 * @return */ - @ApiOperation(value="代理账户划转到合约或币币USDT账户()", notes="代理账户划转到合约或币币USDT账户") + @ApiOperation(value="代理账户划转到合约或币币USDT账户", notes="代理账户划转到合约或币币USDT账户") @PostMapping(value="/agentTransferToWalletCoin") - public Result agentTransferToWalletCoin(@RequestBody @Valid TransferOfBalanceDto transferOfBalanceDto) { - BigDecimal balance = transferOfBalanceDto.getBalance(); - Integer transfertype = transferOfBalanceDto.getTransfertype(); + public Result agentTransferToWalletCoin(@RequestBody @Valid TransferOfBalanceFromAgentDto transferOfBalanceFromAgentDto) { + BigDecimal balance = transferOfBalanceFromAgentDto.getBalance(); + Integer transfertype = transferOfBalanceFromAgentDto.getTransfertype(); return coinService.agentTransferToWalletCoin(balance,transfertype); } -- Gitblit v1.9.1