From 0738ab99e553a20639882945f26027b49315367c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 24 Dec 2024 10:21:54 +0800
Subject: [PATCH] fix(mall): 修正节点奖励分发定时任务执行时间
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 135 insertions(+), 12 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 d6bdc83..ad680eb 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
@@ -51,6 +51,8 @@
private final MallMemberCouponMapper mallMemberCouponMapper;
private final RunVipMapper runVipMapper;
private final MallMemberWalletMapper mallMemberWalletMapper;
+ private final RunNodeSetMapper runNodeSetMapper;
+ private final MallChargeMapper mallChargeMapper;
private final AsyncService asyncService;
@@ -545,8 +547,6 @@
System.out.println(DateUtil.parseTime(DateUtil.date().toTimeStr()));
}
-
-
/**
* 获取全部会员
* 根据会员等级的最大每日获得去给用户新增碳积分
@@ -581,28 +581,45 @@
if(DateUtil.compare(nowTime,startTime) < 0 || DateUtil.compare(nowTime,endTime) > 0){
return;
}
- int hour = DateUtil.hour(nowTime,true);
- boolean flag = isDivisibleByTwo(hour);
-
- int C1 = Integer.parseInt(String.valueOf(DateUtil.between(startTime, endTime, DateUnit.HOUR)));
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;
- BigDecimal V1 = T1.divide(new BigDecimal(C1), 2, BigDecimal.ROUND_DOWN);
if (flag) {
- BigDecimal V2 = V1.divide(new BigDecimal("2"), 2, BigDecimal.ROUND_DOWN);
- V3 = RandomUtil.randomBigDecimal(V2,V1);
+ 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>()
@@ -614,12 +631,13 @@
.last("LIMIT 1")
);
if(CollUtil.isNotEmpty(mallMoneyFlows)){
- V3 = V1.add(V1.subtract(mallMoneyFlows.get(0).getAmount()));
+ BigDecimal U1 = mallMoneyFlows.get(0).getAmount().setScale(0,RoundingMode.DOWN);
+ V2 = V1.add(V1.subtract(U1)).setScale(0,RoundingMode.DOWN);
}else{
- V3 = RandomUtil.randomBigDecimal(V1,V1.multiply(new BigDecimal("2")));
+ V2 = V1.multiply(new BigDecimal("2")).setScale(0,RoundingMode.DOWN);
}
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
}
- V3 = V3.setScale(0,BigDecimal.ROUND_DOWN);
//更新钱包数据
if(V3.intValue() <= 0){
continue;
@@ -672,4 +690,109 @@
}
}
}
+
+ @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