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 | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 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 0cfeb74..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,14 +5,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import com.xcong.excoin.common.annotations.SubmitRepeat;
import com.xcong.excoin.modules.coin.parameter.dto.*;
-import com.xcong.excoin.modules.coin.parameter.vo.AllWalletCoinVo;
-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;
-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.modules.coin.parameter.vo.*;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.GetMapping;
@@ -30,7 +25,9 @@
@Api(value = "会员资产接口", tags = "会员资产接口")
@RestController
@RequestMapping(value = "/api/walletCoin")
-public class CoinController {
+public class
+
+CoinController {
@Resource
private CoinService coinService;
@@ -117,6 +114,17 @@
}
/**
+ * 记录
+ * @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
*/
@@ -197,14 +205,37 @@
}
/**
+ * 获取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();
- return coinService.usdtToGusd(balance);
+ 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);
}
/**
@@ -212,9 +243,21 @@
*/
@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);
}
/**
@@ -222,9 +265,22 @@
*/
@ApiOperation(value="赎回GUSD", notes="赎回GUSD")
@PostMapping(value="/shuhuiGusd")
+ @SubmitRepeat
public Result shuhuiGusd(@RequestBody @Valid ShuhuiGusdDto shuhuiGusdDto) {
BigDecimal balance = shuhuiGusdDto.getBalance();
- return coinService.shuhuiGusd(balance);
+ 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