From 1d58176016c8a7672ba706d55fd45bd2c7c079dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 02 Sep 2022 09:13:50 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 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 23f34c7..3c25b83 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,6 +1,7 @@
 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;
@@ -10,6 +11,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.ActiveNftListVo;
 import cc.mrbird.febs.dapp.vo.TeamListVo;
 import cc.mrbird.febs.dapp.vo.WalletInfoVo;
 import io.swagger.annotations.Api;
@@ -86,11 +88,37 @@
         return new FebsResponse().success().data(dappMemberService.findTeamList(teamListDto));
     }
 
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = ActiveNftListVo.class)
+    })
     @ApiOperation(value = "开盲盒", notes = "开盲盒")
     @PostMapping(value = "/boxSurprise")
     public FebsResponse boxSurprise() {
-        int cnt = dappWalletService.boxSurprise();
-        return new FebsResponse().success().data(cnt);
+        ActiveNftListVo data = dappWalletService.boxSurprise();
+        return new FebsResponse().success().data(data);
+//        return new FebsResponse().fail().message(MessageSourceUtils.getString("box_surprise_002"));
+    }
+
+    @ApiOperation(value = "激活卡牌", notes = "激活卡牌")
+    @PostMapping(value = "/activeNft")
+    public FebsResponse activeNft(@RequestBody @Valid ActiveDto activeDto) {
+        dappWalletService.activeNft(activeDto);
+        return new FebsResponse().success().message(MessageSourceUtils.getString("nft_active_002"));
+    }
+
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = ActiveNftListVo.class)
+    })
+    @ApiOperation(value = "卡牌列表", notes = "卡牌列表")
+    @PostMapping(value = "/findNftList")
+    public FebsResponse findNftList() {
+        return new FebsResponse().success().data(dappWalletService.findUnActiveNftList());
+    }
+
+    @ApiOperation(value = "价格", notes = "价格")
+    @GetMapping(value = "/price")
+    public FebsResponse price() {
+        return new FebsResponse().success().data(dappSystemService.findPriceListIn24H());
     }
 
     @PostMapping(value = "/logout")
@@ -98,18 +126,5 @@
         DappMemberEntity member = LoginUserUtil.getAppUser();
         redisUtils.hdel(AppContants.REDIS_KEY_SIGN, member.getAddress());
         return new FebsResponse().success();
-    }
-
-    @ApiOperation(value = "激活卡牌", notes = "激活卡牌")
-    @PostMapping(value = "/activeNft")
-    public FebsResponse activeNft(@RequestBody @Valid ActiveDto activeDto) {
-        dappWalletService.activeNft(activeDto);
-        return new FebsResponse().success();
-    }
-
-    @ApiOperation(value = "卡牌列表", notes = "卡牌列表")
-    @PostMapping(value = "/findNftList")
-    public FebsResponse findNftList() {
-        return null;
     }
 }

--
Gitblit v1.9.1