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 | 143 ++++++++++++++++++++++++++++++++---------------
1 files changed, 98 insertions(+), 45 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 2c79b71..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;
@@ -654,24 +684,33 @@
public void updateMemberCoin() {
try {
// 操作时间
- DateTime operationDate = DateUtil.date();
+ DateTime operationDate = DateUtil.parseDate(DateUtil.today());
+
+ // 获取会员等级
+ List<RunVip> runVips = runVipMapper.selectList(null);
+ if (CollUtil.isEmpty(runVips)) {
+ log.error("未找到任何会员等级");
+ return;
+ }
+ Map<String, RunVip> runVipMap = runVips.stream()
+ .collect(Collectors.toMap(RunVip::getVipCode, runVip -> runVip));
// 获取最低级别的会员等级
- RunVip minRunVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>()
- .orderByAsc(RunVip::getOrderNumber)
- .last("LIMIT 1")
- );
+ Optional<RunVip> optionalRunVip = runVips.stream().min(Comparator.comparingInt(RunVip::getOrderNumber));
+ RunVip minRunVip = optionalRunVip.orElse(null);
if (minRunVip == null) {
log.error("最低级别的会员等级未找到");
return;
}
- // 获取全部referrerId不为空的用户，并获取每个用户的所有上级id，返回一个set集合
+ // 获取全部等级不是游客的用户，返回一个set集合
List<MallMember> mallMembers = mallMemberMapper.selectList(
new LambdaQueryWrapper<MallMember>()
- .isNotNull(MallMember::getReferrerId)
+ .select(MallMember::getId, MallMember::getLevel, MallMember::getInviteId, MallMember::getReferrerId)
+ .ne(MallMember::getLevel,minRunVip.getVipCode())
);
if (CollUtil.isEmpty(mallMembers)) {
+ log.info("没有符合条件的会员");
return;
}
@@ -679,13 +718,18 @@
.map(MallMember::getId)
.collect(Collectors.toSet());
if (CollUtil.isEmpty(memberIds)) {
+ log.info("没有有效的会员ID");
return;
}
// 构建成员ID到MallMember对象的映射
- Map<Long, MallMember> memberMap = mallMemberMapper.selectBatchIds(memberIds).stream()
+ Map<Long, MallMember> memberMap = mallMembers.stream()
.collect(Collectors.toMap(MallMember::getId, member -> member));
+ // 缓存直推成员
+ Map<String, Set<MallMember>> directMembersCache = mallMembers.stream()
+ .collect(Collectors.groupingBy(MallMember::getReferrerId, Collectors.toSet()));
+
for (Long memberId : memberIds) {
MallMember mallMember = memberMap.get(memberId);
@@ -694,32 +738,35 @@
}
// 获取所有购买了会员等级的直推成员
- List<MallMember> directMembers = mallMemberMapper.selectList(
- new LambdaQueryWrapper<MallMember>()
- .eq(MallMember::getReferrerId, mallMember.getInviteId())
- .ne(MallMember::getLevel, minRunVip.getVipCode())
- );
+ Set<MallMember> directMembers = directMembersCache.get(mallMember.getInviteId());
if (CollUtil.isEmpty(directMembers)) {
continue;
}
+ RunVip memberRunVip = runVipMap.get(mallMember.getLevel());
+ if (memberRunVip == null) {
+ log.warn("会员等级 {} 不存在", mallMember.getLevel());
+ 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()
- );
+ 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) {
@@ -729,30 +776,25 @@
}
- private BigDecimal calculateDirectScore(MallMember mallMember, MallMember directMember, Date operationDate) {
+ private BigDecimal calculateDirectScore(RunVip memberRunVip, MallMember directMember, Date operationDate, Map<String, RunVip> runVipMap) {
// 实际助力
BigDecimal realScore = BigDecimal.ZERO;
try {
- String directLevel = directMember.getLevel();
- RunVip directRunVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, directLevel));
+ RunVip directRunVip = runVipMap.get(directMember.getLevel());
if (directRunVip == null) {
return realScore;
}
// 获取每一个会员的前一日碳积分总和
LambdaQueryWrapper<MallMoneyFlow> mallMoneyFlowLambdaQueryWrapper = new LambdaQueryWrapper<>();
mallMoneyFlowLambdaQueryWrapper.ge(MallMoneyFlow::getCreatedTime, DateUtil.offsetDay(operationDate, -1));
+ mallMoneyFlowLambdaQueryWrapper.lt(MallMoneyFlow::getCreatedTime, operationDate);
mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue());
mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.GET_SCORE.getValue());
+ mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow::getMemberId, directMember.getId());
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;
}
@@ -842,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);
}
@@ -905,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()));
// 获取团队成员
@@ -912,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