From 1ea6fad18342c1a06901552784de38bfad06c808 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 15 Jul 2022 10:39:58 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   21 +++++++++++++--------
 src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java     |   10 +++++-----
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |    5 -----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index 9200c56..c961689 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -47,9 +47,9 @@
         return new FebsResponse().success().data(dappSystemService.findTotalInComeAndList());
     }
 
-    @PostMapping(value = "/encrypt")
-    public FebsResponse encryptTest(@RequestBody EncryptDto encryptDto) {
-        System.out.println(encryptDto.getTest());
-        return new FebsResponse().success().data("123");
-    }
+//    @PostMapping(value = "/encrypt")
+//    public FebsResponse encryptTest(@RequestBody EncryptDto encryptDto) {
+//        System.out.println(encryptDto.getTest());
+//        return new FebsResponse().success().data("123");
+//    }
 }
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 5723b06..ef65601 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -55,16 +55,21 @@
 
     @Override
     public Map<String, Object> findTotalInComeAndList() {
-        List<DappMemberEntity> addresses = dappMemberDao.selectList(null);
-        DappMemberEntity mineAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
-        BigDecimal coinCnt = dappMemberDao.selectAllBalance("normal");
+//        List<DappMemberEntity> addresses = dappMemberDao.selectList(null);
+//        DappMemberEntity mineAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
+//        BigDecimal coinCnt = dappMemberDao.selectAllBalance("normal");
 
         Map<String, Object> result = new HashMap<>();
-        result.put("total", mineAddress.getBalance());
-        result.put("addreessCnt", addresses.size());
-        result.put("coinCnt", coinCnt);
-        result.put("sourceTFC", ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress()));
-        result.put("sourceUSDT", ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()));
+        List<DappIdoAssetsEntity> hasAssets = dappIdoAssetsDao.selectListHasAssets();
+        if (CollUtil.isNotEmpty(hasAssets)) {
+            result.put("buyCnt", hasAssets.size());
+        } else {
+            result.put("buyCnt", 0);
+        }
+//        result.put("addreessCnt", addresses.size());
+//        result.put("coinCnt", coinCnt);
+//        result.put("sourceTFC", ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress()));
+//        result.put("sourceUSDT", ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()));
         return result;
     }
 
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 da5dc95..c9ae7d1 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
@@ -61,11 +61,6 @@
         walletInfo.setCoinAmount(idoAssets.getCoinAmount());
         walletInfo.setUsdtAmount(idoAssets.getUsdtAmount());
         walletInfo.setInviteId(member.getInviteId());
-
-        List<DappIdoAssetsEntity> hasAssets = dappIdoAssetsDao.selectListHasAssets();
-        if (CollUtil.isNotEmpty(hasAssets)) {
-            walletInfo.setBuyCnt(hasAssets.size());
-        }
         return walletInfo;
     }
 

--
Gitblit v1.9.1