Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

Helius

2020-08-21 2bb8c9ae6db2668213d03d02cd8b38e6bc7aae83

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

@@ -5,7 +5,9 @@
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.AllWalletCoinVo;

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

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;

@@ -19,6 +21,7 @@
import org.springframework.web.bind.annotation.RestController;



import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;

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;

@@ -34,6 +37,16 @@
   @Resource

   private CoinService coinService;

   

   /**

    *  获取我的总资产

    * @return

    */

   @ApiOperation(value = "获取我的总资产", notes = "获取我的总资产")

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

   @GetMapping(value = "/getAllWalletCoin")

   public Result getAllWalletCoin() {

      return coinService.getAllWalletCoin();

   }

   /**

    *  获取我的币币资产信息

    * @return

@@ -110,10 +123,10 @@
    * @return

    */

   @ApiOperation(value="获取币币资产交易记录", notes="获取币币资产交易记录")

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

   @GetMapping(value="/getWalletCoinRecords")

   public Result  getWalletCoinRecords() {

      return coinService.getWalletCoinRecords();

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

   @PostMapping(value="/getWalletCoinRecords")

   public Result  getWalletCoinRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {

      return coinService.getWalletCoinRecords(recordsPageDto);

   }

   

   /**

@@ -121,10 +134,10 @@
    * @return

    */

   @ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录")

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

   @GetMapping(value="/getWalletContractRecords")

   public Result getWalletContractRecords() {

      return coinService.getWalletContractRecords();

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

   @PostMapping(value="/getWalletContractRecords")

   public Result getWalletContractRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {

      return coinService.getWalletContractRecords(recordsPageDto);

   }

   

   /**

@@ -132,10 +145,21 @@
    * @return

    */

   @ApiOperation(value="获取代理资产交易记录", notes="获取代理资产交易记录")

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

   @GetMapping(value="/getWalletAgentRecords")

   public Result  getWalletAgentRecords() {

      return coinService.getWalletAgentRecords();

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

   @PostMapping(value="/getWalletAgentRecords")

   public Result  getWalletAgentRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {

      return coinService.getWalletAgentRecords(recordsPageDto);

   }

	
   /**

    *  获取代理资产佣金入账

    * @return

    */

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

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

   @PostMapping(value="/getWalletAgentIntoRecords")

   public Result  getWalletAgentIntoRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {

      return coinService.getWalletAgentIntoRecords(recordsPageDto);

   }

   

   /**

@@ -143,11 +167,23 @@
    * @return

    */

   @ApiOperation(value="币币账户USDT划转到合约账户", notes="币币账户USDT划转到合约账户")

   @PostMapping(value="/coinWalletTransferToContracts")

   public Result coinWalletTransferToContracts(@RequestBody @Valid TransferOfBalanceDto transferOfBalanceDto) {

      BigDecimal balance = transferOfBalanceDto.getBalance();

      String symbol = transferOfBalanceDto.getSymbol();

      return coinService.coinWalletTransferToContract(balance,symbol);

   }

	
   /**

    * 币币账户USDT划转到合约账户(合约多账户)

    * @return

    */

   @ApiOperation(value="币币账户USDT划转到合约账户(合约多账户)", notes="币币账户USDT划转到合约账户(合约多账户)")

   @PostMapping(value="/coinWalletTransferToContract")

   public Result coinWalletTransferToContract(@RequestBody @Valid TransferOfBalanceDto transferOfBalanceDto) {

      BigDecimal balance = transferOfBalanceDto.getBalance();

      String symbol = transferOfBalanceDto.getSymbol();

      return coinService.coinWalletTransferToContract(balance,symbol);

      return coinService.coinWalletTransferToContracts(balance,symbol);

   }

   

   /**

@@ -155,11 +191,23 @@
    * @return

    */

   @ApiOperation(value="合约账户划转到币币USDT账户", notes="合约账户划转到币币USDT账户")

   @PostMapping(value="/contractTransferToWalletCoins")

   public Result contractTransferToWalletCoins(@RequestBody @Valid TransferOfBalanceDto transferOfBalanceDto) {

      BigDecimal balance = transferOfBalanceDto.getBalance();

      String symbol = transferOfBalanceDto.getSymbol();

      return coinService.contractTransferToWalletCoin(balance,symbol);

   }

	
   /**

    * 合约账户划转到币币USDT账户(合约多账户)

    * @return

    */

   @ApiOperation(value="合约账户划转到币币USDT账户(合约多账户)", notes="合约账户划转到币币USDT账户(合约多账户)")

   @PostMapping(value="/contractTransferToWalletCoin")

   public Result contractTransferToWalletCoin(@RequestBody @Valid TransferOfBalanceDto transferOfBalanceDto) {

      BigDecimal balance = transferOfBalanceDto.getBalance();

      String symbol = transferOfBalanceDto.getSymbol();

      return coinService.contractTransferToWalletCoin(balance,symbol);

      return coinService.contractTransferToWalletCoins(balance,symbol);

   }

   

   /**

@@ -167,11 +215,24 @@
    * @return

    */

   @ApiOperation(value="代理账户划转到合约或币币USDT账户", notes="代理账户划转到合约或币币USDT账户")

   @PostMapping(value="/agentTransferToWalletCoins")

   public Result  agentTransferToWalletCoins(@RequestBody @Valid TransferOfBalanceFromAgentDto transferOfBalanceFromAgentDto) {

      BigDecimal balance = transferOfBalanceFromAgentDto.getBalance();

      Integer transfertype = transferOfBalanceFromAgentDto.getTransfertype();

      return coinService.agentTransferToWalletCoin(balance,transfertype);

   }

	
   /**

    * 代理账户划转到USDT账户

    * @return

    */

   @ApiOperation(value="代理账户划转到合约或币币USDT账户(合约多账户)", notes="代理账户划转到合约或币币USDT账户(合约多账户)")

   @PostMapping(value="/agentTransferToWalletCoin")

   public Result  agentTransferToWalletCoin(@RequestBody @Valid TransferOfBalanceFromAgentDto transferOfBalanceFromAgentDto) {

      BigDecimal balance = transferOfBalanceFromAgentDto.getBalance();

      Integer transfertype = transferOfBalanceFromAgentDto.getTransfertype();

      return coinService.agentTransferToWalletCoin(balance,transfertype);

      String symbol = transferOfBalanceFromAgentDto.getSymbol();

      return coinService.agentTransferToWalletCoins(balance,transfertype,symbol);

   }