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

Helius

2020-08-21 6107e978c64bc7ca9b3a238444e899932434e21d

 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.AllWalletCoinVo;

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

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;

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



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

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

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;

@@ -211,6 +213,19 @@
   }

   

   /**

    * 合约账户内部划转(合约多账户)

    * @return

    */

   @ApiOperation(value="合约账户内部划转(合约多账户)", notes="合约账户内部划转(合约多账户)")

   @PostMapping(value="/contractInTransfer")

   public Result contractInTransfer(@RequestBody @Valid ContractInTransferDto contractInTransferDto) {

      BigDecimal balance = contractInTransferDto.getBalance();

      String symbolIn = contractInTransferDto.getSymbolIn();

      String symbolOut = contractInTransferDto.getSymbolOut();

      return coinService.contractInTransfer(balance,symbolIn,symbolOut);

   }

	
   /**

    * 代理账户划转到USDT账户

    * @return

    */

@@ -235,5 +250,16 @@
      return coinService.agentTransferToWalletCoins(balance,transfertype,symbol);

   }

   

   /**

    * 合约账户列表

    * @return

    */

   @ApiOperation(value="合约账户列表", notes="合约账户列表")

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

   @GetMapping(value="/getContractSymbolList")

   public Result  getContractSymbolList() {

      return coinService.getContractSymbolList();

   }

	


}