From 73699775f5546177ce71e3bae33d83a8aa346793 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Mon, 25 May 2020 11:28:10 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 dfeea1f..b198904 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,12 +5,13 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;
+import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;
+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.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -19,14 +20,14 @@
import com.xcong.excoin.modules.coin.service.CoinService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Api(value = "会员资产接口", tags = "会员资产接口")
@RestController
-@RequestMapping(value = "/api/coin")
+@RequestMapping(value = "/api/walletCoin")
public class CoinController {
@Resource
@@ -37,6 +38,7 @@
* @return
*/
@ApiOperation(value = "获取我的币币账户信息", notes = "获取我的币币账户信息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletCoinVo.class)})
@GetMapping(value = "/getWalletCoin")
public Result getWalletCoin() {
return coinService.getWalletCoin();
@@ -47,9 +49,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);
}
/**
@@ -64,13 +67,13 @@
}
/**
- * 查询合约账户里面的资产余额
+ * 查询合约账户里面的可用资产余额
* @return
*/
- @ApiOperation(value="查询合约账户里面的资产余额", notes="查询合约账户里面的资产余额")
+ @ApiOperation(value="查询合约账户里面的可用资产余额", notes="查询合约账户里面的可用资产余额")
@GetMapping(value="/findWalletContractBySymbol")
- public Result findWalletContractBySymbol(String symbol) {
- return coinService.findWalletContractBySymbol(symbol);
+ public Result findWalletContractBySymbol() {
+ return coinService.findWalletContractBySymbol();
}
/**
@@ -79,7 +82,7 @@
*/
@ApiOperation(value="查询币币账户里面的可用资产余额", notes="查询币币账户里面的可用资产余额")
@GetMapping(value="/findWalletCoinBySymbol")
- public Result findWalletCoinBysymbol(String symbol) {
+ public Result findWalletCoinBysymbol(@ApiParam(name="symbol",value="币种",required=true)String symbol) {
return coinService.findWalletCoinBySymbol(symbol);
}
@@ -87,7 +90,7 @@
* 查询代理账户里面的资产余额
* @return
*/
- @ApiOperation(value="查询代理账户里面的资产余额", notes="查询代理账户里面的资产余额")
+ @ApiOperation(value="查询代理账户里面的可用资产余额", notes="查询代理账户里面的可用资产余额")
@GetMapping(value="/findWalletAgentBySymbol")
public Result findWalletAgentBySymbol() {
return coinService.findWalletAgentBySymbol();
@@ -109,7 +112,7 @@
*/
@ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录")
@GetMapping(value="/getWalletContractRecords")
- public Result getWalletContractRecords(String symbol) {
+ public Result getWalletContractRecords(@ApiParam(name="symbol",value="币种",required=true)String symbol) {
return coinService.getWalletContractRecords(symbol);
}
@@ -151,7 +154,7 @@
* 代理账户划转到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();
--
Gitblit v1.9.1