From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 123 ++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 26 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 d65136d..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
@@ -500,23 +500,39 @@
}
}
+ /**
+ * 更新会员等级，将所有等级过期的会员等级重置为最低等级
+ * 查询 RunVip 表中按顺序号升序排列的第一条记录，获取最低会员等级。
+ * 构建查询条件，查询 MallMember 表中会员等级过期且当前等级不是最低等级的用户。
+ * 如果查询结果不为空，遍历每个用户，调用 updateLevel 方法将会员等级更新为最低等级。
+ * 处理完所有用户后，结束方法
+ */
@Override
public void updateMemberLevel() {
- mallMemberWalletMapper.updateScore();
- 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 -> {
- mallMemberMapper.updateVipLevelTimeAndLevel(item.getId(),item.getVipLevelTime(),item.getLevel());
- }
- );
+ // 更新会员等级的逻辑
+ 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);
}
}
@@ -528,8 +544,6 @@
System.out.println(DateUtil.compare(DateUtil.date(),lastDateTime) > 0);
System.out.println(DateUtil.parseTime(DateUtil.date().toTimeStr()));
}
-
-
/**
* 获取全部会员
@@ -565,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>()
@@ -598,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;
@@ -614,7 +646,46 @@
}
}
+
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; // 发生异常时退出循环
+ }
+ }
+ }
}
--
Gitblit v1.9.1