From e1048126f8b32d263b92ffd891aaeb56e9de6a50 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 10:52:16 +0800
Subject: [PATCH] Merge branch 'BNBWEB' of http://120.27.238.55:7000/r/sys-dapp into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 67 ++++++++++++++-------------------
1 files changed, 28 insertions(+), 39 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 8b27383..5c21c91 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -12,6 +12,7 @@
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
+import cc.mrbird.febs.dapp.vo.ApiRunListInfoVo;
import cc.mrbird.febs.dapp.vo.TeamListVo;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import io.swagger.annotations.Api;
@@ -64,19 +65,11 @@
return new FebsResponse().success().data(dappWalletService.recordInPage(recordInPageDto));
}
- @ApiOperation(value = "计算最新价", notes = "计算最新价")
- @PostMapping(value = "/calPrice")
- public FebsResponse calPrice(@RequestBody PriceDto priceDto) {
- return new FebsResponse().success().data(dappWalletService.calPrice(priceDto));
- }
-
- @ApiOperation(value = "系统参数", notes = "系统参数")
- @ApiResponses({
- @ApiResponse(code = 200, message = "success", response = SystemDto.class)
- })
- @GetMapping(value = "/system")
- public FebsResponse system() {
- return new FebsResponse().success().data(dappSystemService.system());
+ @ApiOperation(value = "提现", notes = "提现")
+ @PostMapping(value = "/withdraw")
+ public FebsResponse withdraw(@RequestBody @Valid WithdrawDto withdrawDto) {
+ dappWalletService.withdraw(withdrawDto);
+ return new FebsResponse().success().message("success");
}
@ApiOperation(value = "我的团队", notes = "我的团队")
@@ -84,43 +77,39 @@
@ApiResponse(code = 200, message = "success", response = TeamListVo.class)
})
@PostMapping(value = "/team")
- public FebsResponse team(@RequestBody TeamListDto teamListDto) {
- return new FebsResponse().success().data(dappMemberService.findTeamList(teamListDto));
+ public FebsResponse team() {
+ return new FebsResponse().success().data(dappMemberService.findTeamList());
}
+ @ApiOperation(value = "动能信息", notes = "动能信息")
@ApiResponses({
- @ApiResponse(code = 200, message = "success", response = ActiveNftListVo.class)
+ @ApiResponse(code = 200, message = "success", response = ApiRunListInfoVo.class)
})
- @ApiOperation(value = "开盲盒", notes = "开盲盒")
- @PostMapping(value = "/boxSurprise")
- public FebsResponse boxSurprise() {
-// ActiveNftListVo data = dappWalletService.boxSurprise();
-// return new FebsResponse().success().data(data);
-
- return new FebsResponse().fail().message(MessageSourceUtils.getString("box_surprise_002"));
+ @PostMapping(value = "/runListInfo")
+ public FebsResponse runListInfo() {
+ return new FebsResponse().success().data(dappMemberService.findRunListInfo());
}
- @ApiOperation(value = "激活卡牌", notes = "激活卡牌")
- @PostMapping(value = "/activeNft")
- public FebsResponse activeNft(@RequestBody @Valid ActiveDto activeDto) {
- dappWalletService.activeNft(activeDto);
- return new FebsResponse().success().message(MessageSourceUtils.getString("nft_active_002"));
- }
-
- @ApiResponses({
- @ApiResponse(code = 200, message = "success", response = ActiveNftListVo.class)
- })
- @ApiOperation(value = "卡牌列表", notes = "卡牌列表")
- @PostMapping(value = "/findNftList")
- public FebsResponse findNftList() {
- return new FebsResponse().success().data(dappWalletService.findUnActiveNftList());
- }
-
+// @ApiOperation(value = "我的团队", notes = "我的团队")
+// @ApiResponses({
+// @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+// })
+// @PostMapping(value = "/team")
+// public FebsResponse team() {
+// return new FebsResponse().success().data(dappMemberService.findTeamList());
+// }
@PostMapping(value = "/logout")
public FebsResponse logout() {
DappMemberEntity member = LoginUserUtil.getAppUser();
redisUtils.hdel(AppContants.REDIS_KEY_SIGN, member.getAddress());
+ redisUtils.hdel(AppContants.REDIS_KEY_MEMBER_INFO, member.getAddress());
return new FebsResponse().success();
}
+
+ @ApiOperation(value = "计算手续费", notes = "计算手续费")
+ @PostMapping(value = "/calPrice")
+ public FebsResponse calPrice(@RequestBody PriceDto priceDto) {
+ return new FebsResponse().success().data(dappWalletService.calPrice(priceDto));
+ }
}
--
Gitblit v1.9.1