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

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

   }

   

   /**

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

   }

   

   /**

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

   }