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 | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 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 ffd55d5..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
@@ -398,29 +398,32 @@
@Override
public ApiRunListInfoVo findRunListInfo() {
ApiRunListInfoVo apiRunListInfoVo = new ApiRunListInfoVo();
-// //获取当前是第几轮队列
-// String redisKey = "QUEUE_COUNT";
-// 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)){
-// redisUtils.set(redisKey,queueCount,0L);
-// memberOutCount = queueCount;
-// }
-// //出局条件的人数
-// /**
-// * 初始大小 5+4*0
-// * 1 1,2,3,4,5 1出局 5+4*0
-// * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
-// * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
-// * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
-// */
-// Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
-// //判断当前是否符合出局条件
-// QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
-// objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
-// //实际投资人数
-// Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+ //获取当前是第几轮队列
+ String redisKey = "QUEUE_COUNT";
+ 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)|| !queueCount.equals(memberOutCount)){
+ redisUtils.set(redisKey,queueCount,0L);
+ memberOutCount = queueCount;
+ }
+ //出局条件的人数
+ /**
+ * 初始大小 5+4*0
+ * 1 1,2,3,4,5 1出局 5+4*0
+ * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
+ * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
+ * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
+ */
+ Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
+ //判断当前是否符合出局条件
+ QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
+ //实际投资人数
+ Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+ 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);
//实际投资人数小于出局条件人数
--
Gitblit v1.9.1