From ee5c6327f939b3df45f701266ce1e93bbef2c0f1 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 25 May 2020 16:50:57 +0800 Subject: [PATCH] 20200525 --- src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 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 cd552d6..51f7399 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,15 +5,22 @@ 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; @@ -35,6 +42,7 @@ * @return */ @ApiOperation(value = "获取我的币币账户信息", notes = "获取我的币币账户信息") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletCoinVo.class)}) @GetMapping(value = "/getWalletCoin") public Result getWalletCoin() { return coinService.getWalletCoin(); @@ -45,9 +53,10 @@ * @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)}) + @GetMapping(value = "/getWalletCoinBySymbol") + public Result getWalletCoinBySymbol(@ApiParam(name="symbol",value="币种",required=true)String symbol) { + return coinService.getWalletCoinBySymbol(symbol); } /** @@ -56,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(); @@ -85,7 +95,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(); @@ -96,6 +107,7 @@ * @return */ @ApiOperation(value="获取币币资产交易记录", notes="获取币币资产交易记录") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)}) @GetMapping(value="/getWalletCoinRecords") public Result getWalletCoinRecords() { return coinService.getWalletCoinRecords(); @@ -106,9 +118,10 @@ * @return */ @ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)}) @GetMapping(value="/getWalletContractRecords") - public Result getWalletContractRecords(@ApiParam(name="symbol",value="币种",required=true)String symbol) { - return coinService.getWalletContractRecords(symbol); + public Result getWalletContractRecords() { + return coinService.getWalletContractRecords(); } /** @@ -116,6 +129,7 @@ * @return */ @ApiOperation(value="获取代理资产交易记录", notes="获取代理资产交易记录") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)}) @GetMapping(value="/getWalletAgentRecords") public Result getWalletAgentRecords() { return coinService.getWalletAgentRecords(); @@ -149,11 +163,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