Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/cho...

gao

2020-05-25 73699775f5546177ce71e3bae33d83a8aa346793

 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java

@@ -5,6 +5,7 @@
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;

@@ -18,12 +19,15 @@
import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceDto;

import com.xcong.excoin.modules.coin.service.CoinService;



import io.swagger.annotations.Api;

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

@@ -45,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);

   }

   

   /**

@@ -77,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);

   }

   

@@ -107,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);

   }