From cb7ed03a0ca96558fa6659ea462849c2688d07ff Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 11:46:30 +0800
Subject: [PATCH] perf(mall): 优化会员碳积分释放逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 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..ad065f7 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
@@ -545,8 +545,6 @@
System.out.println(DateUtil.parseTime(DateUtil.date().toTimeStr()));
}
-
-
/**
* 获取全部会员
* 根据会员等级的最大每日获得去给用户新增碳积分
@@ -581,28 +579,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 +629,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;
--
Gitblit v1.9.1