From 11e14ba210ed19aaf89cade6d5b51b6c53ca38aa Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Tue, 13 Dec 2022 16:54:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 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 3c597fb..5c21c91 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,10 +1,18 @@
package cc.mrbird.febs.dapp.controller;
+import cc.mrbird.febs.common.annotation.EncryptEnable;
+import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
+import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.dto.*;
+import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.service.DappMemberService;
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;
@@ -15,11 +23,14 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+
/**
- * @author
+ * @author
* @date 2022-03-17
**/
@Slf4j
+@EncryptEnable
@RequiredArgsConstructor
@CrossOrigin("*")
@RestController
@@ -30,6 +41,7 @@
private final DappWalletService dappWalletService;
private final DappSystemService dappSystemService;
private final DappMemberService dappMemberService;
+ private final RedisUtils redisUtils;
@ApiOperation(value = "获取账户信息接口", notes = "获取账号信息接口")
@ApiResponses({
@@ -44,8 +56,7 @@
@ApiOperation(value = "转账", notes = "转账")
@PostMapping(value = "/transfer")
public FebsResponse transfer(@RequestBody TransferDto transferDto) {
- dappWalletService.transfer(transferDto);
- return new FebsResponse().success();
+ return new FebsResponse().success().data(dappWalletService.transfer(transferDto));
}
@ApiOperation(value = "记录列表", notes = "记录列表")
@@ -54,19 +65,11 @@
return new FebsResponse().success().data(dappWalletService.recordInPage(recordInPageDto));
}
- @ApiOperation(value = "计算最新价", notes = "计算最新价")
- @PostMapping(value = "/calPrice")
- public FebsResponse calPrice() {
- return new FebsResponse().success().data(dappWalletService.calPrice());
- }
-
- @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 = "我的团队")
@@ -74,7 +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 = ApiRunListInfoVo.class)
+ })
+ @PostMapping(value = "/runListInfo")
+ public FebsResponse runListInfo() {
+ return new FebsResponse().success().data(dappMemberService.findRunListInfo());
+ }
+
+// @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