From 4e43b6496e163787ea7397ca422c9e081ac2857a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Feb 2021 15:42:32 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java |   90 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 6 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..06ba293 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,8 @@
 import javax.validation.Valid;
 
 import com.xcong.excoin.modules.coin.parameter.vo.AllWalletCoinVo;
+import com.xcong.excoin.modules.coin.parameter.vo.CoinInListVo;
+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 +23,8 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.coin.parameter.dto.CoinInListDto;
+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;
@@ -73,7 +77,6 @@
 	}
 	
 	/**
-	 * --todo
 	 *  获取我的合约资产信息
 	 * @return
 	 */
@@ -89,9 +92,12 @@
 	 * @return
 	 */
 	@ApiOperation(value="查询合约账户里面的可用资产余额", notes="查询合约账户里面的可用资产余额")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+	})
 	@GetMapping(value="/findWalletContractBySymbol")
-	public Result findWalletContractBySymbol() {
-		return coinService.findWalletContractBySymbol();
+	public Result findWalletContractBySymbol(String symbol) {
+		return coinService.findWalletContractBySymbol(symbol);
 	}
 	
 	/**
@@ -116,6 +122,17 @@
 	@GetMapping(value="/findWalletAgentBySymbol")
 	public Result findWalletAgentBySymbol() {
 		return coinService.findWalletAgentBySymbol();
+	}
+	
+	/**
+	 *  记录
+	 * @return
+	 */
+	@ApiOperation(value="记录", notes="记录")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = CoinInListVo.class)})
+	@PostMapping(value="/coinInList")
+	public Result coinInList(@RequestBody @Valid CoinInListDto coinInListDto) {
+		return coinService.coinInList(coinInListDto);
 	}
 	
 	/**
@@ -167,11 +184,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 +208,36 @@
 	 * @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);
+	}
+	
+	/**
+	 * 合约账户内部划转(合约多账户)
+	 * @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);
 	}
 	
 	/**
@@ -191,11 +245,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