From 8ff5fc0f83912e0fbaa9f834bef12778537c8433 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 Aug 2020 15:43:26 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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..7166929 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;
@@ -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;
@@ -167,11 +169,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 +193,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 +230,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