From ec2c41a6dfbcd99b90d8df2b71f364f7d4fae96c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Dec 2022 10:34:23 +0800
Subject: [PATCH] 20221213转币

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 17ae581..78eb160 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -403,7 +403,7 @@
         String memberOutCount = redisUtils.getString(redisKey);
         DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
         String queueCount = queueCountSet.getValue();
-        if(StrUtil.isBlank(memberOutCount)){
+        if(StrUtil.isBlank(memberOutCount)|| !queueCount.equals(memberOutCount)){
             redisUtils.set(redisKey,queueCount,0L);
             memberOutCount = queueCount;
         }
@@ -421,8 +421,11 @@
         objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
         //实际投资人数
         Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
-        BigDecimal runPercent = new BigDecimal(selectCount).divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
-        apiRunListInfoVo.setRunPercent(runPercent);
+        int runPercentNum = memberCount - selectCount;
+        runPercentNum = runPercentNum > 0 ? runPercentNum : 1;
+        apiRunListInfoVo.setRunPercent(new BigDecimal(runPercentNum).multiply(new BigDecimal(0.4)).setScale(BigDecimal.ROUND_DOWN,1));
+//        BigDecimal runPercent = new BigDecimal(selectCount).divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+//        apiRunListInfoVo.setRunPercent(runPercent);
         //实际投资人数小于出局条件人数
         //符合则出局 实际投资人数等于出局条件人数
         DappSystemProfit dappSystemProfitIn = dappSystemProfitDao.selectSystemProfitInByState(DappSystemProfit.STATE_IN);

--
Gitblit v1.9.1