From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 149 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 129 insertions(+), 20 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 b505e06..adb6950 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
@@ -5,11 +5,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeVo;
-import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo;
-import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;
-import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;
-import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletContractInfoVo;
+import com.xcong.excoin.common.annotations.SubmitRepeat;
+import com.xcong.excoin.modules.coin.parameter.dto.*;
+import com.xcong.excoin.modules.coin.parameter.vo.*;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,8 +17,6 @@
import org.springframework.web.bind.annotation.RestController;
import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceDto;
-import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceFromAgentDto;
import com.xcong.excoin.modules.coin.service.CoinService;
import lombok.extern.slf4j.Slf4j;
@@ -29,11 +25,23 @@
@Api(value = "会员资产接口", tags = "会员资产接口")
@RestController
@RequestMapping(value = "/api/walletCoin")
-public class CoinController {
+public class
+
+CoinController {
@Resource
private CoinService coinService;
+ /**
+ * 获取我的总资产
+ * @return
+ */
+ @ApiOperation(value = "获取我的总资产", notes = "获取我的总资产")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = AllWalletCoinVo.class)})
+ @GetMapping(value = "/getAllWalletCoin")
+ public Result getAllWalletCoin() {
+ return coinService.getAllWalletCoin();
+ }
/**
* 获取我的币币资产信息
* @return
@@ -106,14 +114,25 @@
}
/**
+ * 记录
+ * @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);
+ }
+
+ /**
* 获取币币资产交易记录
* @return
*/
@ApiOperation(value="获取币币资产交易记录", notes="获取币币资产交易记录")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
- @GetMapping(value="/getWalletCoinRecords")
- public Result getWalletCoinRecords() {
- return coinService.getWalletCoinRecords();
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+ @PostMapping(value="/getWalletCoinRecords")
+ public Result getWalletCoinRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletCoinRecords(recordsPageDto);
}
/**
@@ -121,10 +140,10 @@
* @return
*/
@ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
- @GetMapping(value="/getWalletContractRecords")
- public Result getWalletContractRecords() {
- return coinService.getWalletContractRecords();
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+ @PostMapping(value="/getWalletContractRecords")
+ public Result getWalletContractRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletContractRecords(recordsPageDto);
}
/**
@@ -132,10 +151,21 @@
* @return
*/
@ApiOperation(value="获取代理资产交易记录", notes="获取代理资产交易记录")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
- @GetMapping(value="/getWalletAgentRecords")
- public Result getWalletAgentRecords() {
- return coinService.getWalletAgentRecords();
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+ @PostMapping(value="/getWalletAgentRecords")
+ public Result getWalletAgentRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletAgentRecords(recordsPageDto);
+ }
+
+ /**
+ * 获取代理资产佣金入账
+ * @return
+ */
+ @ApiOperation(value="获取代理资产佣金入账", notes="获取代理资产佣金入账")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})
+ @PostMapping(value="/getWalletAgentIntoRecords")
+ public Result getWalletAgentIntoRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletAgentIntoRecords(recordsPageDto);
}
/**
@@ -173,6 +203,85 @@
Integer transfertype = transferOfBalanceFromAgentDto.getTransfertype();
return coinService.agentTransferToWalletCoin(balance,transfertype);
}
+
+ /**
+ * 获取GUSD账户信息
+ */
+ @ApiOperation(value="获取GUSD账户信息", notes="获取GUSD账户信息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberGusdInfoVo.class)})
+ @GetMapping(value="/findMemberGusdInfo")
+ public Result findMemberGusdInfo() {
+ return coinService.findMemberGusdInfo();
+ }
+
+ /**
+ * USDT兌換成GUSD
+ * @return
+ */
+ @ApiOperation(value="USDT兌換成GUSD", notes="USDT兌換成GUSD")
+ @PostMapping(value="/usdtToGusd")
+ @SubmitRepeat
+ public Result usdtToGusd(@RequestBody @Valid UsdtToGusdDto usdtToGusdDto) {
+ BigDecimal balance = usdtToGusdDto.getBalance();
+ Integer type = usdtToGusdDto.getType();
+ return coinService.usdtToGusd(balance,type);
+ }
+
+ /**
+ * 获取兌換GUSD记录
+ * @return
+ */
+ @ApiOperation(value="获取兌換GUSD记录", notes="获取兌換GUSD记录")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = UsdtToGusdVo.class)})
+ @PostMapping(value="/getusdtToGusdRecords")
+ public Result getusdtToGusdRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getusdtToGusdRecords(recordsPageDto);
+ }
+
+ /**
+ * 质押GUSD
+ */
+ @ApiOperation(value="质押GUSD", notes="质押GUSD")
+ @PostMapping(value="/zhiYaGusd")
+ @SubmitRepeat
+ public Result zhiYaGusd(@RequestBody @Valid ZhiYaGusdDto zhiYaGusdDto) {
+ BigDecimal balance = zhiYaGusdDto.getBalance();
+ return coinService.zhiYaGusd(balance);
+ }
+
+ /**
+ * 获取质押GUSD记录
+ * @return
+ */
+ @ApiOperation(value="获取质押GUSD记录", notes="获取质押GUSD记录")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ZhiyaInfoVo.class)})
+ @PostMapping(value="/getZhiyaRecords")
+ public Result getZhiyaRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getZhiyaRecords(recordsPageDto);
+ }
+
+ /**
+ * 赎回GUSD
+ */
+ @ApiOperation(value="赎回GUSD", notes="赎回GUSD")
+ @PostMapping(value="/shuhuiGusd")
+ @SubmitRepeat
+ public Result shuhuiGusd(@RequestBody @Valid ShuhuiGusdDto shuhuiGusdDto) {
+ BigDecimal balance = shuhuiGusdDto.getBalance();
+ Long id = shuhuiGusdDto.getId();
+ return coinService.shuhuiGusd(balance,id);
+ }
+
+ /**
+ * 获取质押GUSD奖励记录
+ * @return
+ */
+ @ApiOperation(value="获取质押GUSD奖励记录", notes="获取质押GUSD奖励记录")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ZhiyaRewardVo.class)})
+ @PostMapping(value="/getZhiyaReward")
+ public Result getZhiyaReward(@RequestBody @Valid ZhiyaRewardRecordsPageDto recordsPageDto) {
+ return coinService.getZhiyaReward(recordsPageDto);
+ }
}
--
Gitblit v1.9.1