From 7a2f69e4cf9771c9450b009ea5deaaa07e279f11 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 28 Jul 2022 22:44:42 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 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..1501361 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,16 @@
 package cc.mrbird.febs.dapp.controller;
 
+import cc.mrbird.febs.common.annotation.EncryptEnable;
+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.TeamListVo;
 import cc.mrbird.febs.dapp.vo.WalletInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +25,7 @@
  * @date 2022-03-17
  **/
 @Slf4j
+@EncryptEnable
 @RequiredArgsConstructor
 @CrossOrigin("*")
 @RestController
@@ -30,6 +35,8 @@
 
     private final DappWalletService dappWalletService;
     private final DappSystemService dappSystemService;
+    private final DappMemberService dappMemberService;
+    private final RedisUtils redisUtils;
 
     @ApiOperation(value = "获取账户信息接口", notes = "获取账号信息接口")
     @ApiResponses({
@@ -41,25 +48,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 = "记录列表")
@@ -70,8 +62,8 @@
 
     @ApiOperation(value = "计算最新价", notes = "计算最新价")
     @PostMapping(value = "/calPrice")
-    public FebsResponse calPrice() {
-        return new FebsResponse().success().data(dappWalletService.calPrice());
+    public FebsResponse calPrice(@RequestBody PriceDto priceDto) {
+        return new FebsResponse().success().data(dappWalletService.calPrice(priceDto));
     }
 
     @ApiOperation(value = "系统参数", notes = "系统参数")
@@ -82,4 +74,27 @@
     public FebsResponse system() {
         return new FebsResponse().success().data(dappSystemService.system());
     }
+
+    @ApiOperation(value = "我的团队", notes = "我的团队")
+    @ApiResponses({
+            @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));
+    }
+
+    @ApiOperation(value = "开盲盒", notes = "开盲盒")
+    @PostMapping(value = "/boxSurprise")
+    public FebsResponse boxSurprise() {
+        int cnt = dappWalletService.boxSurprise();
+        return new FebsResponse().success().data(cnt);
+    }
+
+    @PostMapping(value = "/logout")
+    public FebsResponse logout() {
+        DappMemberEntity member = LoginUserUtil.getAppUser();
+        redisUtils.hdel(AppContants.REDIS_KEY_SIGN, member.getAddress());
+        return new FebsResponse().success();
+    }
 }

--
Gitblit v1.9.1