From bcac1518746956058313ac24280236d50e98c318 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 06 Jul 2024 14:51:18 +0800
Subject: [PATCH] 逻辑

---
 src/main/java/cc/mrbird/febs/dapp/vo/ApiIndexInfoVo.java                  |    8 --------
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   18 ++++++++++++------
 src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java                    |   10 ++++++++++
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index ae56277..9f94227 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -98,6 +98,18 @@
         BigDecimal runPerk = dappFundFlowDao.selectSumRunPerkByMemberId(member.getId());
         walletInfo.setRunPerk(runPerk);
 
+
+        List<DappStorage> allAddressNums = dappStorageMapper.selectListGroupByMemberId();
+        walletInfo.setAddressNum(CollUtil.isEmpty(allAddressNums) ? 0 : allAddressNums.size());
+
+        DappStorage dappStorage = dappStorageMapper.selectOneByCreateTimeDesc(0, 1);
+        walletInfo.setBuChangDate(ObjectUtil.isEmpty(dappStorage) ?
+                DateUtil.offsetDay(new Date(), 1) : DateUtil.offsetDay(dappStorage.getCreateTime(), 1));
+        walletInfo.setBuchangChi(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.BUCAHNG_CHI.getType(),
+                DataDictionaryEnum.BUCAHNG_CHI.getCode()
+        ).getValue());
+
         return walletInfo;
     }
 
@@ -664,12 +676,6 @@
                 DataDictionaryEnum.JI_SHU_CHI.getType(),
                 DataDictionaryEnum.JI_SHU_CHI.getCode()
         ).getValue());
-        List<DappStorage> dappStorages = dappStorageMapper.selectListGroupByMemberId();
-        apiIndexInfoVo.setAddressNum(CollUtil.isEmpty(dappStorages) ? 0 : dappStorages.size());
-
-        DappStorage dappStorage = dappStorageMapper.selectOneByCreateTimeDesc(0, 1);
-        apiIndexInfoVo.setBuChangDate(ObjectUtil.isEmpty(dappStorage) ?
-                DateUtil.offsetDay(new Date(), 1) : DateUtil.offsetDay(dappStorage.getCreateTime(), 1));
         return apiIndexInfoVo;
     }
 
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/ApiIndexInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/ApiIndexInfoVo.java
index 1efe4e4..23802c0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/ApiIndexInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/ApiIndexInfoVo.java
@@ -4,8 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @ApiModel(value = "ApiIndexInfoVo", description = "系统设置费率")
 public class ApiIndexInfoVo {
@@ -27,10 +25,4 @@
 
     @ApiModelProperty(value = "技术")
     private String jishuChi;
-
-    @ApiModelProperty(value = "全网持币地址数量")
-    private Integer addressNum;
-
-    @ApiModelProperty(value = "永动补偿池结束时间")
-    private Date buChangDate;
 }
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
index a363669..a7839fc 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
@@ -5,6 +5,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author 
@@ -44,4 +45,13 @@
     @ApiModelProperty(value = "动态释放")
     private BigDecimal runPerk;
 
+    @ApiModelProperty(value = "全网持币地址数量")
+    private Integer addressNum;
+
+    @ApiModelProperty(value = "永动补偿池")
+    private String buchangChi;
+
+    @ApiModelProperty(value = "永动补偿池结束时间")
+    private Date buChangDate;
+
 }

--
Gitblit v1.9.1