From fbe6ab3f9dee466b1b6557f27c862322ef45a89b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 02 Mar 2025 14:15:18 +0800
Subject: [PATCH] refactor(mallMember): 注释掉会员列表页面的三个按钮- 注释掉了"碳币拨付"、"碳积分拨付"和"修改会员等级"三个按钮 - 保留了"添加会员"、"登录密码重置"和"资金密码重置"按钮
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 223 insertions(+), 10 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 c7e69f2..f5229f3 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,7 +1,9 @@
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;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.AsyncService;
@@ -28,6 +30,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -53,8 +56,11 @@
private final MallMemberWalletMapper mallMemberWalletMapper;
private final RunNodeSetMapper runNodeSetMapper;
private final MallChargeMapper mallChargeMapper;
+ private final IMallMoneyFlowService mallMoneyFlowService;
private final AsyncService asyncService;
+ private final FebsConfigure febsConfigure;
+ private final RunVipGrowMapper runVipGrowMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -619,7 +625,11 @@
BigDecimal V3 = BigDecimal.ZERO;
if (flag) {
V2 = V1.divide(new BigDecimal("2"), 0, RoundingMode.DOWN);
- V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ if(V1.intValue() <= V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue()+1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ }
}else{
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
new LambdaQueryWrapper<MallMoneyFlow>()
@@ -636,7 +646,39 @@
}else{
V2 = V1.multiply(new BigDecimal("2")).setScale(0,RoundingMode.DOWN);
}
- V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ if(V1.intValue() < V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ }else if(V1.intValue() == V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue()+1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.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){
@@ -647,6 +689,154 @@
}
}
}
+
+ @Override
+ public void updateMemberCoin() {
+ try {
+ // 操作时间
+ 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));
+
+ // 获取最低级别的会员等级
+ Optional<RunVip> optionalRunVip = runVips.stream().min(Comparator.comparingInt(RunVip::getOrderNumber));
+ RunVip minRunVip = optionalRunVip.orElse(null);
+ if (minRunVip == null) {
+ log.error("最低级别的会员等级未找到");
+ return;
+ }
+
+ // 获取全部等级不是游客的用户，返回一个set集合
+ List<MallMember> mallMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .select(MallMember::getId, MallMember::getLevel, MallMember::getInviteId, MallMember::getReferrerId)
+ .ne(MallMember::getLevel,minRunVip.getVipCode())
+ );
+ if (CollUtil.isEmpty(mallMembers)) {
+ log.info("没有符合条件的会员");
+ return;
+ }
+
+ Set<Long> memberIds = mallMembers.stream()
+ .map(MallMember::getId)
+ .collect(Collectors.toSet());
+ if (CollUtil.isEmpty(memberIds)) {
+ log.info("没有有效的会员ID");
+ return;
+ }
+
+
+ // 构建成员ID到MallMember对象的映射
+ Map<Long, MallMember> memberMap = mallMembers.stream()
+ .collect(Collectors.toMap(MallMember::getId, member -> member));
+ // 缓存直推成员
+ Map<String, Set<MallMember>> directMembersCache = mallMembers.stream()
+ .filter(member -> StrUtil.isNotBlank(member.getReferrerId()))
+ .collect(Collectors.groupingBy(MallMember::getReferrerId, Collectors.toSet()));
+
+
+ for (Long memberId : memberIds) {
+ MallMember mallMember = memberMap.get(memberId);
+ if (mallMember == null || minRunVip.getVipCode().equals(mallMember.getLevel())) {
+ continue;
+ }
+
+ // 获取所有购买了会员等级的直推成员
+ 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) {
+ 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) {
+ log.error("更新会员积分时发生异常", e);
+ throw new RuntimeException("更新会员积分时发生异常", e); // 根据业务需求选择是否抛出异常
+ }
+ }
+
+
+ private BigDecimal calculateDirectScore(RunVip memberRunVip, MallMember directMember, Date operationDate, Map<String, RunVip> runVipMap) {
+ // 实际助力
+ BigDecimal realScore = BigDecimal.ZERO;
+
+ try {
+ 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;
+ }
+
+ // 如果直推小于会员本身的会员等级，则全部助力
+ if (memberRunVip.getOrderNumber() >= directRunVip.getOrderNumber()) {
+ BigDecimal rebatePercent = directRunVip.getRebatePercent();
+ BigDecimal totalScore = mallMoneyFlows.stream()
+ .map(MallMoneyFlow::getAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ realScore = totalScore.multiply(rebatePercent).setScale(0, RoundingMode.DOWN);
+ } else {
+ Integer growthCnt = memberRunVip.getGrowthCnt();
+ if (growthCnt == null || growthCnt <= 0) {
+ return realScore;
+ }
+ BigDecimal rebatePercent1 = memberRunVip.getRebatePercent();
+ if (rebatePercent1 == null || rebatePercent1.compareTo(BigDecimal.ZERO) <= 0) {
+ return realScore;
+ }
+ realScore = new BigDecimal(growthCnt).multiply(rebatePercent1).setScale(0, RoundingMode.DOWN);
+ }
+ } catch (Exception e) {
+ // 记录日志并返回默认值
+ log.error("Error calculating direct score", e);
+ return BigDecimal.ZERO;
+ }
+
+ return realScore;
+ }
+
+
public boolean isDivisibleByTwo(int number) {
@@ -705,20 +895,34 @@
}
//获取节点设置
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());
+ BigDecimal achieve = getDirectAchieve(item.getInviteId(),item.getDirectorTime(),endTime);
+ //判断总业绩是否小于最小业绩
+ if(minRunNodeSet.getMinAchieve().compareTo(achieve) > 0){
+ item.setDirector(YesOrNoEnum.NO.getValue());
+ mallMemberMapper.updateById(item);
+ continue;
+ }
BigDecimal nodePercent = getNodePercent(runNodeSets, achieve);
- asyncService.releaseNodeCoin(achieve,nodePercent,balanceToCoin,item.getId());
+ if(BigDecimal.ZERO.compareTo(nodePercent) >= 0){
+ continue;
+ }
+ asyncService.releaseNodeCoin(achieve,nodePercent,item.getId());
+ item.setDirectorTime(endTime);
+ mallMemberMapper.updateById(item);
}
}
- private BigDecimal getDirectAchieve(String inviteId) {
+ private BigDecimal getDirectAchieve(String inviteId,Date startTime,Date endTime) {
try {
// 获取直推成员和团队成员的ID集合
@@ -733,6 +937,8 @@
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)) {
@@ -756,6 +962,9 @@
new LambdaQueryWrapper<MallMember>()
.eq(MallMember::getReferrerId, inviteId)
);
+ if(CollUtil.isEmpty(directMembers)){
+ return memberIds;
+ }
memberIds.addAll(directMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
// 获取团队成员
@@ -763,6 +972,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