From bd4d6ee6e9e303e6fdbf05fede63dc3cd50263c3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Dec 2024 17:33:30 +0800
Subject: [PATCH] feat(mall): 添加节点业绩累计功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 467 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 461 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index c7990b9..2c79b71 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -1,22 +1,24 @@
package cc.mrbird.febs.mall.service.impl;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.utils.AppContants;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.AsyncService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
-import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
@@ -27,6 +29,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -46,6 +49,14 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final MallMemberCouponMapper mallMemberCouponMapper;
+ private final RunVipMapper runVipMapper;
+ private final MallMemberWalletMapper mallMemberWalletMapper;
+ private final RunNodeSetMapper runNodeSetMapper;
+ private final MallChargeMapper mallChargeMapper;
+ private final IMallMoneyFlowService mallMoneyFlowService;
+
+ private final AsyncService asyncService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -281,7 +292,7 @@
}
BigDecimal income = profit.multiply(profitProp).divide(BigDecimal.valueOf(agentMemberList.size()), 2, RoundingMode.HALF_UP);
- if (income.compareTo(BigDecimal.ZERO) > 0) {
+ if (income.compareTo(BigDecimal.ZERO) < 1) {
continue;
}
@@ -477,4 +488,448 @@
}
log.info("#####==店补/董事==end==######");
}
+
+ @Override
+ public void getOrderCoupon(Long orderId) {
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderId);
+ if(CollUtil.isNotEmpty(mallOrderItemList)){
+ List<Long> memberCouponIds = mallOrderItemList.stream().map(MallOrderItem::getMemberCouponId).collect(Collectors.toList());
+ if(CollUtil.isNotEmpty(memberCouponIds)){
+ for(Long memberCouponId : memberCouponIds){
+ MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
+ mallMemberCoupon.setState(2);
+ mallMemberCouponMapper.updateById(mallMemberCoupon);
+ }
+ }
+ }
+ }
+
+ /**
+ * 更新会员等级，将所有等级过期的会员等级重置为最低等级
+ * 查询 RunVip 表中按顺序号升序排列的第一条记录，获取最低会员等级。
+ * 构建查询条件，查询 MallMember 表中会员等级过期且当前等级不是最低等级的用户。
+ * 如果查询结果不为空，遍历每个用户，调用 updateLevel 方法将会员等级更新为最低等级。
+ * 处理完所有用户后，结束方法
+ */
+ @Override
+ public void updateMemberLevel() {
+
+ // 更新会员等级的逻辑
+ try {
+ List<RunVip> runVips = runVipMapper.selectList(new LambdaQueryWrapper<RunVip>().orderByAsc(RunVip::getOrderNumber));
+ RunVip runVip = runVips.get(0);
+
+ // 获取过期时间小于等于当前时间，并且会员等级不是最小等级游客的所有用户
+ LambdaQueryWrapper<MallMember> mallMemberLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ mallMemberLambdaQueryWrapper.le(MallMember::getVipLevelTime, DateUtil.date());
+ mallMemberLambdaQueryWrapper.ne(MallMember::getLevel, runVip.getVipCode());
+ List<MallMember> mallMembers = mallMemberMapper.selectList(mallMemberLambdaQueryWrapper);
+ if (CollUtil.isNotEmpty(mallMembers)) {
+ mallMembers.forEach(
+ item -> {
+ try {
+ mallMemberMapper.updateLevel(item.getId(), runVip.getVipCode());
+ } catch (Exception e) {
+ log.error("Error updating member level for user {}: ", item.getId(), e);
+ }
+ }
+ );
+ }
+ } catch (Exception e) {
+ log.error("Error fetching or updating VIP levels: ", e);
+ }
+ }
+
+ public static void main(String[] args) {
+
+ //计算当前时间是否是最后一次
+ String lastDateTimeStr = DateUtil.formatDate(DateUtil.date())+" 20:00:00";
+ DateTime lastDateTime = DateUtil.parseDateTime(lastDateTimeStr);
+ System.out.println(DateUtil.compare(DateUtil.date(),lastDateTime) > 0);
+ System.out.println(DateUtil.parseTime(DateUtil.date().toTimeStr()));
+ }
+
+ /**
+ * 获取全部会员
+ * 根据会员等级的最大每日获得去给用户新增碳积分
+ * 更新钱包数据
+ * 生成对应的流水数据
+ * 释放规则
+ * 当前时间的小时 H1 / 2,整除时
+ * 每个会员等级每日总释放量 T1 / 总时间间隔 C1 = 每次释放量上限 V1
+ * 每次释放量上线 V1 / 2 = 每次释放量下限 V2
+ * 每次释放量 V3 = 随机 [V2,V1）
+ * 当前时间的小时 H1 / 2,不整除时
+ * 每个会员等级每日总释放量 T1 / 总时间间隔 C1 = 每次释放量上限 V1
+ * 每次释放量 V3 = 每次释放量上限 V1 + （每次释放量上限 V1 - 上一次释放的数量 U1）
+ * 如果上一次没有释放，则 V3 = 每次释放量上限 [V1,V1*2)
+ */
+ @Override
+ public void updateRunScore() {
+ DateTime nowTimeStr = DateUtil.date();
+ String startTimeStr = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.RUN_START_TIME.getType(),
+ RunVipDataDictionaryEnum.RUN_START_TIME.getCode()
+ ).getValue();
+ String endTimeStr = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.RUN_END_TIME.getType(),
+ RunVipDataDictionaryEnum.RUN_END_TIME.getCode()
+ ).getValue();
+
+ DateTime nowTime = DateUtil.parseTime(nowTimeStr.toTimeStr());
+ DateTime startTime = DateUtil.parseTime(startTimeStr);
+ DateTime endTime = DateUtil.parseTime(endTimeStr);
+ //判断时间是否在时间范围内
+ if(DateUtil.compare(nowTime,startTime) < 0 || DateUtil.compare(nowTime,endTime) > 0){
+ return;
+ }
+
+ List<RunVip> runVips = runVipMapper.selectList(null);
+ Map<String, RunVip> runVipMap = runVips.stream()
+ .collect(Collectors.toMap(RunVip::getVipCode, runVip -> runVip));
+ List<MallMember> mallMembers = mallMemberMapper.selectList(null);
+ if(CollUtil.isNotEmpty(mallMembers)){
+ /**
+ * 释放规则
+ * 当前时间的小时 H1 / 2,整除时
+ * 每个会员等级每日总释放量 T1 / 总时间间隔 C1 = 每次释放量上限 V1
+ * 每次释放量上线 V1 / 2 = 每次释放量下限 V2
+ * 每次释放量 V3 = 随机 [V2,V1）
+ * 当前时间的小时 H1 / 2,不整除时
+ * 每个会员等级每日总释放量 T1 / 总时间间隔 C1 = 每次释放量下限 V1
+ * 如果上一次有释放
+ * 每次释放量上限 V2 = 每次释放量上限 V1 + （每次释放量上限 V1 - 上一次释放的数量 U1）
+ * 如果上一次没有释放
+ * 每次释放量上限 V2 = 每次释放量上限 V1 * 2
+ * 每次释放量 V3 = 随机 [V1,U2）
+ */
+ int hour = DateUtil.hour(nowTime,true);
+ boolean flag = isDivisibleByTwo(hour);
+
+ int C1 = Integer.parseInt(String.valueOf(DateUtil.between(startTime, endTime, DateUnit.HOUR)));
+ for (MallMember item : mallMembers) {
+ RunVip runVip = runVipMap.get(item.getLevel());
+ if(ObjectUtil.isEmpty(runVip)){
+ //未匹配到，直接跳过
+ continue;
+ }
+ //每次释放的碳积分
+ //每一个等级每日释放最大值
+ BigDecimal T1 = new BigDecimal(runVip.getGrowthCnt());
+ BigDecimal V1 = T1.divide(new BigDecimal(C1), 0, RoundingMode.DOWN);
+ BigDecimal V2 = BigDecimal.ZERO;
+ BigDecimal V3 = BigDecimal.ZERO;
+ if (flag) {
+ V2 = V1.divide(new BigDecimal("2"), 0, RoundingMode.DOWN);
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ }else{
+ List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
+ new LambdaQueryWrapper<MallMoneyFlow>()
+ .eq(MallMoneyFlow::getMemberId, item.getId())
+ .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue())
+ .eq(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.GET_SCORE.getValue())
+ .ge(MallMoneyFlow::getCreatedTime, DateUtil.beginOfDay(nowTimeStr))
+ .orderByDesc(MallMoneyFlow::getCreatedTime)
+ .last("LIMIT 1")
+ );
+ if(CollUtil.isNotEmpty(mallMoneyFlows)){
+ BigDecimal U1 = mallMoneyFlows.get(0).getAmount().setScale(0,RoundingMode.DOWN);
+ V2 = V1.add(V1.subtract(U1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V2 = V1.multiply(new BigDecimal("2")).setScale(0,RoundingMode.DOWN);
+ }
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ }
+ //更新钱包数据
+ if(V3.intValue() <= 0){
+ continue;
+ }
+ //异步线程池去释放积分操作
+ asyncService.releaseScore(V3,item.getId());
+ }
+ }
+ }
+
+ @Override
+ public void updateMemberCoin() {
+ try {
+ // 操作时间
+ DateTime operationDate = DateUtil.date();
+
+ // 获取最低级别的会员等级
+ RunVip minRunVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>()
+ .orderByAsc(RunVip::getOrderNumber)
+ .last("LIMIT 1")
+ );
+ if (minRunVip == null) {
+ log.error("最低级别的会员等级未找到");
+ return;
+ }
+
+ // 获取全部referrerId不为空的用户，并获取每个用户的所有上级id，返回一个set集合
+ List<MallMember> mallMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .isNotNull(MallMember::getReferrerId)
+ );
+ if (CollUtil.isEmpty(mallMembers)) {
+ return;
+ }
+
+ Set<Long> memberIds = mallMembers.stream()
+ .map(MallMember::getId)
+ .collect(Collectors.toSet());
+ if (CollUtil.isEmpty(memberIds)) {
+ return;
+ }
+
+
+ // 构建成员ID到MallMember对象的映射
+ Map<Long, MallMember> memberMap = mallMemberMapper.selectBatchIds(memberIds).stream()
+ .collect(Collectors.toMap(MallMember::getId, member -> member));
+
+ for (Long memberId : memberIds) {
+ MallMember mallMember = memberMap.get(memberId);
+ if (mallMember == null || minRunVip.getVipCode().equals(mallMember.getLevel())) {
+ continue;
+ }
+
+ // 获取所有购买了会员等级的直推成员
+ List<MallMember> directMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, mallMember.getInviteId())
+ .ne(MallMember::getLevel, minRunVip.getVipCode())
+ );
+ if (CollUtil.isEmpty(directMembers)) {
+ continue;
+ }
+
+ for (MallMember item : directMembers) {
+ BigDecimal realScore = calculateDirectScore(mallMember, item, operationDate);
+ if(BigDecimal.ZERO.compareTo(realScore) >= 0){
+ continue;
+ }
+ walletService.addScore(realScore, memberId);
+ String orderNo = MallUtils.getOrderNum("ZLS");
+ mallMoneyFlowService.runVipMoneyFlowAdd(
+ memberId,
+ item.getId(),
+ orderNo,
+ FlowTypeEnum.SCORE.getValue(),
+ RunVipMoneyFlowTypeEnum.DIRECT_SCORE.getValue(),
+ realScore,
+ StrUtil.format(RunVipMoneyFlowTypeEnum.DIRECT_SCORE.getDescription(), realScore),
+ YesOrNoEnum.YES.getValue()
+ );
+ }
+ }
+ } catch (Exception e) {
+ log.error("更新会员积分时发生异常", e);
+ throw new RuntimeException("更新会员积分时发生异常", e); // 根据业务需求选择是否抛出异常
+ }
+ }
+
+
+ private BigDecimal calculateDirectScore(MallMember mallMember, MallMember directMember, Date operationDate) {
+ // 实际助力
+ BigDecimal realScore = BigDecimal.ZERO;
+
+ try {
+ String directLevel = directMember.getLevel();
+ RunVip directRunVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, directLevel));
+ if (directRunVip == null) {
+ return realScore;
+ }
+ // 获取每一个会员的前一日碳积分总和
+ LambdaQueryWrapper<MallMoneyFlow> mallMoneyFlowLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ mallMoneyFlowLambdaQueryWrapper.ge(MallMoneyFlow::getCreatedTime, DateUtil.offsetDay(operationDate, -1));
+ mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue());
+ mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.GET_SCORE.getValue());
+
+ List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(mallMoneyFlowLambdaQueryWrapper);
+ if (CollUtil.isEmpty(mallMoneyFlows)) {
+ return realScore;
+ }
+
+ String memberLevel = mallMember.getLevel();
+ RunVip memberRunVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, memberLevel));
+ if (memberRunVip == null) {
+ return realScore;
+ }
+
+ // 如果直推小于会员本身的会员等级，则全部助力
+ if (memberRunVip.getOrderNumber() >= directRunVip.getOrderNumber()) {
+ BigDecimal rebatePercent = directRunVip.getRebatePercent();
+ BigDecimal totalScore = mallMoneyFlows.stream()
+ .map(MallMoneyFlow::getAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ realScore = totalScore.multiply(rebatePercent).setScale(0, RoundingMode.DOWN);
+ } else {
+ Integer growthCnt = memberRunVip.getGrowthCnt();
+ if (growthCnt == null || growthCnt <= 0) {
+ return realScore;
+ }
+ BigDecimal rebatePercent1 = memberRunVip.getRebatePercent();
+ if (rebatePercent1 == null || rebatePercent1.compareTo(BigDecimal.ZERO) <= 0) {
+ return realScore;
+ }
+ realScore = new BigDecimal(growthCnt).multiply(rebatePercent1).setScale(0, RoundingMode.DOWN);
+ }
+ } catch (Exception e) {
+ // 记录日志并返回默认值
+ log.error("Error calculating direct score", e);
+ return BigDecimal.ZERO;
+ }
+
+ return realScore;
+ }
+
+
+
+
+ public boolean isDivisibleByTwo(int number) {
+ return number % 2 == 0;
+ }
+
+
+ /**
+ * 更新会员钱包中的积分，将所有积分大于0的会员钱包积分清零
+ * 初始化最大尝试次数 maxAttempts 和当前尝试次数 attemptCount。
+ * 使用 while 循环，每次查询1000条积分大于0的会员钱包记录。
+ * 如果查询结果为空，设置标志位 flag 为 false，退出循环。
+ * 否则，提取记录ID并调用 updateScore 方法将积分更新为0。
+ * 增加尝试次数，继续下一次循环，直到达到最大尝试次数或查询结果为空。
+ */
+ @Override
+ public void updateMemberScore() {
+ // 更新会员钱包积分的逻辑
+ int maxAttempts = 100; // 最大尝试次数
+ int attemptCount = 0;
+ boolean flag = true;
+ while (flag && attemptCount < maxAttempts) {
+ try {
+ Page<MallMemberWallet> page = new Page<>(0, 1000);
+ IPage<MallMemberWallet> result = mallMemberWalletMapper.selectPage(
+ page,
+ new LambdaQueryWrapper<MallMemberWallet>()
+ .gt(MallMemberWallet::getScore, 0)
+ );
+ List<MallMemberWallet> mallMemberWallets = result.getRecords();
+ if (CollUtil.isEmpty(mallMemberWallets)) {
+ flag = false;
+ } else {
+ List<Long> ids = mallMemberWallets.stream().map(MallMemberWallet::getId).collect(Collectors.toList());
+ mallMemberWalletMapper.updateScore(ids);
+ }
+ attemptCount++;
+ } catch (Exception e) {
+ log.error("Error updating member level: ", e);
+ flag = false; // 发生异常时退出循环
+ }
+ }
+ }
+
+ @Override
+ public void updateNodeScore() {
+ /**
+ * 获取全部的节点
+ */
+ List<MallMember> mallMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getDirector, YesOrNoEnum.YES.getValue())
+ );
+ if(CollUtil.isEmpty(mallMembers)){
+ return;
+ }
+ //获取节点设置
+ List<RunNodeSet> runNodeSets = runNodeSetMapper.selectList(null);
+ BigDecimal balanceToCoin = new BigDecimal(
+ dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getType(),
+ RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getCode()).getValue()
+ ).setScale(2, BigDecimal.ROUND_DOWN);
+
+ DateTime endTime = DateUtil.date();
+ for (MallMember item : mallMembers) {
+ //获取总业绩
+ BigDecimal achieve = getDirectAchieve(item.getInviteId(),item.getDirectorTime(),endTime);
+ if(BigDecimal.ZERO.compareTo(achieve) >= 0){
+ continue;
+ }
+ BigDecimal nodePercent = getNodePercent(runNodeSets, achieve);
+ if(BigDecimal.ZERO.compareTo(nodePercent) >= 0){
+ continue;
+ }
+ asyncService.releaseNodeCoin(achieve,nodePercent,balanceToCoin,item.getId());
+ item.setDirectorTime(endTime);
+ mallMemberMapper.updateById(item);
+ }
+ }
+
+ private BigDecimal getDirectAchieve(String inviteId,Date startTime,Date endTime) {
+
+ try {
+ // 获取直推成员和团队成员的ID集合
+ Set<Long> memberIds = getTeamMemberIds(inviteId);
+
+ if (CollUtil.isEmpty(memberIds)) {
+ return BigDecimal.ZERO;
+ }
+
+ // 获取团队业绩(不包含本人业绩)
+ List<MallCharge> mallCharges = mallChargeMapper.selectList(
+ new LambdaQueryWrapper<MallCharge>()
+ .in(MallCharge::getMemberId, memberIds)
+ .eq(MallCharge::getState, YesOrNoEnum.YES.getValue())
+ .ge(MallCharge::getCreatedTime, startTime)
+ .lt(MallCharge::getCreatedTime, endTime)
+ );
+
+ if (CollUtil.isEmpty(mallCharges)) {
+ return BigDecimal.ZERO;
+ }
+
+ return mallCharges.stream()
+ .map(MallCharge::getAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ } catch (Exception e) {
+ // 异常处理
+ log.error("Error occurred while calculating direct achieve for member: {}", inviteId, e);
+ return BigDecimal.ZERO;
+ }
+ }
+
+ private Set<Long> getTeamMemberIds(String inviteId) {
+ Set<Long> memberIds = new HashSet<>();
+ // 获取直推成员
+ List<MallMember> directMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, inviteId)
+ );
+ memberIds.addAll(directMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
+
+ // 获取团队成员
+ List<MallMember> teamMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .in(MallMember::getReferrerId, directMembers.stream().map(MallMember::getInviteId).collect(Collectors.toSet()))
+ );
+ memberIds.addAll(teamMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
+
+ return memberIds;
+ }
+
+
+ private BigDecimal getNodePercent(List<RunNodeSet> runNodeSets, BigDecimal directAchieve) {
+ BigDecimal percent = BigDecimal.ZERO;
+ //获取directAchieve在runNodeSets中哪一个位置
+ for(RunNodeSet item : runNodeSets){
+ BigDecimal minAchieve = item.getMinAchieve();
+ BigDecimal maxAchieve = item.getMaxAchieve();
+ BigDecimal nodePercent = new BigDecimal(item.getNodePercent());
+ if(directAchieve.compareTo(minAchieve) >= 0 && directAchieve.compareTo(maxAchieve) < 0){
+ percent = nodePercent;
+ break;
+ }
+ }
+ return percent;
+ }
}
--
Gitblit v1.9.1