From 657d6ca995fade9e0f23002c54263f1c972a254f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 14 Aug 2023 15:16:33 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java |   93 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 65 insertions(+), 28 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 7e00ba7..5ac9e28 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -8,12 +8,12 @@
 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.entity.DappNodeOrderEntity;
 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 cc.mrbird.febs.dapp.vo.*;
+import cn.hutool.core.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -23,6 +23,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.HashMap;
 
 /**
  * @author
@@ -42,47 +43,83 @@
     private final DappMemberService dappMemberService;
     private final RedisUtils redisUtils;
 
-    @ApiOperation(value = "获取账户信息接口", notes = "获取账号信息接口")
+    @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "success", response = WalletInfoVo.class)
+            @ApiResponse(code = 200, message = "success", response = DappMemberInfoVo.class)
     })
-    @PostMapping(value = "/walletInfo")
-    public FebsResponse walletInfo() {
-        WalletInfoVo walletInfoVo = dappWalletService.walletInfo();
-        return new FebsResponse().success().data(walletInfoVo);
-    }
-
-    @ApiOperation(value = "转账", notes = "转账")
-    @PostMapping(value = "/transfer")
-    public FebsResponse transfer(@RequestBody TransferDto transferDto) {
-        return new FebsResponse().success().data(dappWalletService.transfer(transferDto));
-    }
-
-    @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 = "/withdraw")
-    public FebsResponse withdraw(@RequestBody WithdrawDto withdrawDto) {
-        return new FebsResponse().success();
+    @PostMapping(value = "/memberInfo")
+    public FebsResponse memberInfo() {
+        return dappMemberService.getMemberInfo();
     }
 
     @ApiOperation(value = "我的团队", notes = "我的团队")
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
     })
-    @PostMapping(value = "/team")
+    @PostMapping(value = "/teamList")
     public FebsResponse team() {
         return new FebsResponse().success().data(dappMemberService.findTeamList());
+    }
+
+    @ApiOperation(value = "记录列表", notes = "记录列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = DappFundFlowVo.class)
+    })
+    @PostMapping(value = "/recordInPage")
+    public FebsResponse recordInPage(@RequestBody RecordInPageDto recordInPageDto) {
+//        return new FebsResponse().success().data(dappWalletService.recordInPage(recordInPageDto));
+        return new FebsResponse().success().data(dappWalletService.getRecordVoInPage(recordInPageDto));
+    }
+
+    @ApiOperation(value = "兑换AUSDT", notes = "兑换AUSDT")
+    @PostMapping(value = "/transferAusd")
+    public FebsResponse transferAusd(@RequestBody TransferAusdDto transferAusdDto) {
+        return new FebsResponse().success().data(dappWalletService.transferAusd(transferAusdDto));
+    }
+
+    @ApiOperation(value = "闪兑-资产钱包转帐到闪兑钱包3% 手续费(扣币)", notes = "资产钱包转帐到闪兑钱包3% 手续费(扣币)")
+    @PostMapping(value = "/mineToCoin")
+    public FebsResponse mineToCoin(@RequestBody MineToCoinDto mineToCoinDto) {
+        dappWalletService.mineToCoin(mineToCoinDto);
+        return new FebsResponse().success().data("success");
+    }
+
+    @ApiOperation(value = "互转ANDAO", notes = "互转ANDAO")
+    @PostMapping(value = "/roundCoin")
+    public FebsResponse roundCoin(@RequestBody RoundCoinDto roundCoinDto) {
+        dappWalletService.roundCoin(roundCoinDto);
+        return new FebsResponse().success().data("success");
+    }
+
+    @ApiOperation(value = "互转AUSDT", notes = "互转AUSDT")
+    @PostMapping(value = "/roundCoinAusdt")
+    public FebsResponse roundCoinAusdt(@RequestBody RoundCoinDto roundCoinDto) {
+        dappWalletService.roundCoinAusdt(roundCoinDto);
+        return new FebsResponse().success().data("success");
+    }
+
+    @ApiOperation(value = "提现", notes = "提现")
+    @PostMapping(value = "/withdraw")
+    public FebsResponse withdraw(@RequestBody @Valid WithdrawDto withdrawDto) {
+//        return new FebsResponse().success().message("合约更新中");
+        dappWalletService.withdraw(withdrawDto);
+        return new FebsResponse().success().message("success");
+    }
+
+    @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());
     }
 
     @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();
     }
 }

--
Gitblit v1.9.1