From b8def92a54d520776e37db7925c5109f3bd95ff8 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 09 Nov 2022 23:56:39 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 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 0b2b353..12bfe0b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,12 +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.dapp.dto.RecordInPageDto;
-import cc.mrbird.febs.dapp.dto.SystemDto;
-import cc.mrbird.febs.dapp.dto.TransferDto;
-import cc.mrbird.febs.dapp.dto.WalletOperateDto;
+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.TeamListVo;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,11 +22,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 +39,8 @@
private final DappWalletService dappWalletService;
private final DappSystemService dappSystemService;
+ private final DappMemberService dappMemberService;
+ private final RedisUtils redisUtils;
@ApiOperation(value = "获取账户信息接口", notes = "获取账号信息接口")
@ApiResponses({
@@ -41,25 +52,10 @@
return new FebsResponse().success().data(walletInfoVo);
}
-// @ApiOperation(value = "兑换接口", notes = "兑换")
-// @PostMapping(value = "/change")
-// public FebsResponse change(@RequestBody WalletOperateDto walletOperateDto) {
-// dappWalletService.change(walletOperateDto);
-// return new FebsResponse().success().message("兑换成功");
-// }
-
-// @ApiOperation(value = "提现接口", notes = "提现接口")
-// @PostMapping(value = "/withdraw")
-// public FebsResponse withdraw(@RequestBody WalletOperateDto walletOperateDto) {
-// dappWalletService.withdraw(walletOperateDto);
-// return new FebsResponse().success().message("申请成功, 等待审核");
-// }
-
@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 = "记录列表")
@@ -68,18 +64,33 @@
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 = "提现")
+ @PostMapping(value = "/withdraw")
+ public FebsResponse withdraw(@RequestBody @Valid WithdrawDto withdrawDto) {
+ dappWalletService.withdraw(withdrawDto);
+ return new FebsResponse().success().message("success");
}
- @ApiOperation(value = "系统参数", notes = "系统参数")
+ @ApiOperation(value = "我的团队", notes = "我的团队")
@ApiResponses({
- @ApiResponse(code = 200, message = "success", response = SystemDto.class)
+ @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
})
- @GetMapping(value = "/system")
- public FebsResponse system() {
- return new FebsResponse().success().data(dappSystemService.system());
+ @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