From d3862d4493613a4b1e3e69a078e3957652f1d5c8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 11 May 2024 18:06:15 +0800
Subject: [PATCH] 香港新环境

---
 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java |   65 ++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 25 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 2fd7b8c..5d4a74b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,5 +1,6 @@
 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.common.utils.LoginUserUtil;
@@ -9,6 +10,7 @@
 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.MoneyFlowVo;
 import cc.mrbird.febs.dapp.vo.TeamListVo;
 import cc.mrbird.febs.dapp.vo.WalletInfoVo;
 import io.swagger.annotations.Api;
@@ -19,11 +21,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * @author 
  * @date 2022-03-17
  **/
 @Slf4j
+@EncryptEnable
 @RequiredArgsConstructor
 @CrossOrigin("*")
 @RestController
@@ -32,7 +37,6 @@
 public class ApiDappMemberController {
 
     private final DappWalletService dappWalletService;
-    private final DappSystemService dappSystemService;
     private final DappMemberService dappMemberService;
     private final RedisUtils redisUtils;
 
@@ -46,41 +50,52 @@
         return new FebsResponse().success().data(walletInfoVo);
     }
 
-    @ApiOperation(value = "转账", notes = "转账")
-    @PostMapping(value = "/transfer")
-    public FebsResponse transfer(@RequestBody TransferDto transferDto) {
-        dappWalletService.transfer(transferDto);
-        return new FebsResponse().success();
+    @ApiOperation(value = "提现", notes = "提现")
+    @PostMapping(value = "/transferOut")
+    public FebsResponse transferOut(@RequestBody @Valid TransferOutDto transferOutDto) {
+        return dappWalletService.transferOut(transferOutDto);
     }
 
-    @ApiOperation(value = "记录列表", notes = "记录列表")
+    @ApiOperation(value = "质押", notes = "质押")
+    @PostMapping(value = "/transfer")
+    public FebsResponse transfer(@RequestBody @Valid TransferDto transferDto) {
+        return new FebsResponse().success().data(dappWalletService.transfer(transferDto));
+    }
+
+    @ApiOperation(value = "我的质押", notes = "我的质押")
+    @PostMapping(value = "/zyInPage")
+    public FebsResponse zyInPage(@RequestBody RecordInPageDto recordInPageDto) {
+        return new FebsResponse().success().data(dappWalletService.zyInPage(recordInPageDto));
+    }
+
+    @ApiOperation(value = "产矿收益", notes = "产矿收益")
+    @PostMapping(value = "/memberFundList")
+    public FebsResponse memberFundList(@RequestBody RecordInPageDto recordInPageDto) {
+        return new FebsResponse().success().data(dappWalletService.memberFundList(recordInPageDto));
+    }
+
+    @ApiOperation(value = "资金流水列表", notes = "资金流水列表")
     @PostMapping(value = "/recordInPage")
     public FebsResponse recordInPage(@RequestBody RecordInPageDto recordInPageDto) {
         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 = "我的团队")
     @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));
+    @GetMapping(value = "/team")
+    public FebsResponse team() {
+        return new FebsResponse().success().data(dappMemberService.findTeamList());
+    }
+
+    @ApiOperation(value = "我的团队-奖励列表", notes = "我的团队-奖励列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MoneyFlowVo.class)
+    })
+    @PostMapping(value = "/teamList")
+    public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
+        return new FebsResponse().success().data(dappMemberService.findMoneyFlowVos(teamListDto));
     }
 
     @PostMapping(value = "/logout")

--
Gitblit v1.9.1