From 5d9b16b455079407acdcff587d6152ef6cb6bc55 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 03 Jan 2025 17:22:54 +0800
Subject: [PATCH] feat(mall): 为 ApiGrowChargeDto 中的 amount 字段添加 NotNull 注解
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 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 5e4d4e8..39b108d 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,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.configure.FebsConfigure;
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.MallUtils;
@@ -29,6 +30,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -57,6 +59,8 @@
private final IMallMoneyFlowService mallMoneyFlowService;
private final AsyncService asyncService;
+ private final FebsConfigure febsConfigure;
+ private final RunVipGrowMapper runVipGrowMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -640,6 +644,32 @@
}
V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
}
+ //会员权益的收益
+ RunVipGrow runVipGrow = runVipGrowMapper.selectList(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, item.getId())
+ .eq(RunVipGrow::getLevelNow, runVip.getVipCode())
+ .orderByDesc(RunVipGrow::getId)
+ ).stream().findFirst().orElse(null);
+ if(null != runVipGrow){
+ BigDecimal amountNow = runVipGrow.getAmountNow();
+ RunVip runVipNext = runVips.stream().filter(vipItem -> vipItem.getOrderNumber() == runVip.getOrderNumber() + 1).findFirst().orElse(null);
+ if(runVipNext != null){
+ BigDecimal presentPrice = runVip.getPresentPrice();
+ BigDecimal presentPriceNext = runVipNext.getPresentPrice();
+ BigDecimal subtract = presentPriceNext.subtract(presentPrice);
+
+ BigDecimal divide = amountNow.divide(subtract, 4, RoundingMode.DOWN);
+
+ Integer growthCnt = runVip.getGrowthCnt();
+ Integer growthCntNext = runVipNext.getGrowthCnt();
+ int growthNum = growthCntNext - growthCnt;
+
+ BigDecimal growthAmountTotal = divide.multiply(new BigDecimal(growthNum));
+ BigDecimal growthAmount = growthAmountTotal.divide(new BigDecimal(C1), 0, RoundingMode.DOWN);
+ V3 = V3.add(growthAmount);
+ }
+ }
//更新钱包数据
if(V3.intValue() <= 0){
continue;
@@ -719,22 +749,24 @@
continue;
}
for (MallMember item : directMembers) {
- BigDecimal realScore = calculateDirectScore(memberRunVip, item, operationDate, runVipMap);
- 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()
- );
+ CompletableFuture.runAsync(() -> {
+ BigDecimal realScore = calculateDirectScore(memberRunVip, item, operationDate, runVipMap);
+ if(BigDecimal.ZERO.compareTo(realScore) >= 0){
+ return;
+ }
+ 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()
+ );
+ },febsConfigure.asyncThreadPoolTaskExecutor());
}
}
} catch (Exception e) {
@@ -852,24 +884,28 @@
}
//获取节点设置
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);
+
+ //获取节点设置runNodeSets中orderNumber最小的节点
+ RunNodeSet minRunNodeSet = runNodeSets.stream().min(Comparator.comparingInt(RunNodeSet::getOrderNumber)).orElse(null);
+ if(null == minRunNodeSet){
+ return;
+ }
DateTime endTime = DateUtil.date();
for (MallMember item : mallMembers) {
//获取总业绩
BigDecimal achieve = getDirectAchieve(item.getInviteId(),item.getDirectorTime(),endTime);
- if(BigDecimal.ZERO.compareTo(achieve) >= 0){
+ //判断总业绩是否小于最小业绩
+ if(minRunNodeSet.getMinAchieve().compareTo(achieve) > 0){
+ item.setDirector(YesOrNoEnum.NO.getValue());
+ mallMemberMapper.updateById(item);
continue;
}
BigDecimal nodePercent = getNodePercent(runNodeSets, achieve);
if(BigDecimal.ZERO.compareTo(nodePercent) >= 0){
continue;
}
- asyncService.releaseNodeCoin(achieve,nodePercent,balanceToCoin,item.getId());
+ asyncService.releaseNodeCoin(achieve,nodePercent,item.getId());
item.setDirectorTime(endTime);
mallMemberMapper.updateById(item);
}
@@ -915,6 +951,9 @@
new LambdaQueryWrapper<MallMember>()
.eq(MallMember::getReferrerId, inviteId)
);
+ if(CollUtil.isEmpty(directMembers)){
+ return memberIds;
+ }
memberIds.addAll(directMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
// 获取团队成员
@@ -922,6 +961,10 @@
new LambdaQueryWrapper<MallMember>()
.in(MallMember::getReferrerId, directMembers.stream().map(MallMember::getInviteId).collect(Collectors.toSet()))
);
+
+ if(CollUtil.isEmpty(teamMembers)){
+ return memberIds;
+ }
memberIds.addAll(teamMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
return memberIds;
--
Gitblit v1.9.1