From d4723041b7f52b76ca90263280f5c6aa360c530d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Aug 2020 11:41:32 +0800
Subject: [PATCH] 202008221

---
 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
index 64df9f2..4274413 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
+++ b/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;
@@ -167,11 +168,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 +192,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 +216,35 @@
 	 * @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);
+	}
+	
+	/**
+	 * 合约账户列表
+	 * @return
+	 */
+	@ApiOperation(value="合约账户列表", notes="合约账户列表")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = ContractSymbolListVo.class)})
+	@GetMapping(value="/getContractSymbolList")
+	public Result  getContractSymbolList() {
+		return coinService.getContractSymbolList();
 	}
 	
 

--
Gitblit v1.9.1