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 |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

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 50a05e5..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;
     }
 
@@ -511,7 +516,17 @@
 
     @Override
     public void idoBuy(DappMemberEntity member, BigDecimal amount) {
+        DappIdoAssetsEntity idoAssets = dappIdoAssetsDao.selectByMemberId(member.getId());
+        BigDecimal count = amount.divide(new BigDecimal(50), 0, RoundingMode.HALF_UP);
+        BigDecimal coinAmount = new BigDecimal(1000).multiply(count);
+        idoAssets.setCoinAmount(idoAssets.getCoinAmount().add(coinAmount));
+        idoAssets.setUsdtAmount(idoAssets.getUsdtAmount().add(amount));
+        dappIdoAssetsDao.updateById(idoAssets);
+
         DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
+        if (parent == null) {
+            return;
+        }
 
         int box = 0;
         Object parentRecommend = redisUtils.hget(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress());
@@ -534,12 +549,10 @@
             dappFundFlowDao.insert(boxFundFlow);
         }
 
-        DappIdoAssetsEntity idoAssets = dappIdoAssetsDao.selectByMemberId(member.getId());
-        BigDecimal count = amount.divide(new BigDecimal(50), 0, RoundingMode.HALF_UP);
-        BigDecimal coinAmount = new BigDecimal(1000).multiply(count);
-        idoAssets.setBoxCnt(idoAssets.getBoxCnt() + box);
-        idoAssets.setCoinAmount(idoAssets.getCoinAmount().add(coinAmount));
-        idoAssets.setUsdtAmount(idoAssets.getUsdtAmount().add(amount));
-        dappIdoAssetsDao.updateById(idoAssets);
+        BigDecimal returnCoin = coinAmount.multiply(new BigDecimal(5).divide(new BigDecimal(100), 2, RoundingMode.UP));
+        DappIdoAssetsEntity parentIdoAssets = dappIdoAssetsDao.selectById(parent.getId());
+        parentIdoAssets.setBoxCnt(parentIdoAssets.getBoxCnt() + box);
+        parentIdoAssets.setCoinAmount(parentIdoAssets.getCoinAmount().add(returnCoin));
+        dappIdoAssetsDao.updateById(parentIdoAssets);
     }
 }

--
Gitblit v1.9.1