From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 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 deb78e0..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);
}
/**
@@ -211,6 +228,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 +265,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();
+ }
+
}
--
Gitblit v1.9.1