Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-07 3312b506e4f3a840623071ab56fa8ec68816a811

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

@@ -6,6 +6,7 @@
import javax.validation.Valid;



import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;

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;

@@ -23,9 +24,6 @@
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 io.swagger.annotations.ApiParam;

import lombok.extern.slf4j.Slf4j;



@Slf4j

@@ -54,8 +52,11 @@
    */

   @ApiOperation(value="获取币币账户某个币种信息", notes="获取币币账户某个币种信息")

   @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(@ApiParam(name="symbol",value="币种",required=true)String symbol) {

   public Result getWalletCoinBySymbol(String symbol) {

      return coinService.getWalletCoinBySymbol(symbol);

   }

   

@@ -86,8 +87,11 @@
    * @return

    */

   @ApiOperation(value="查询币币账户里面的可用资产余额", notes="查询币币账户里面的可用资产余额")

   @ApiImplicitParams({

      @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")

   })

   @GetMapping(value="/findWalletCoinBySymbol")

   public Result findWalletCoinBysymbol(@ApiParam(name="symbol",value="币种",required=true)String symbol) {

   public Result findWalletCoinBysymbol(String symbol) {

      return coinService.findWalletCoinBySymbol(symbol);

   }

   

@@ -136,6 +140,17 @@
   }

   

   /**

    *  获取代理资产佣金入账

    * @return

    */

   @ApiOperation(value="获取代理资产佣金入账", notes="获取代理资产佣金入账")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})

   @GetMapping(value="/getWalletAgentIntoRecords")

   public Result  getWalletAgentIntoRecords() {

      return coinService.getWalletAgentIntoRecords();

   }

	
   /**

    * 币币账户USDT划转到合约账户

    * @return

    */