From 2118fdbc320a062211b506c220f320a8c0c46b32 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:28:10 +0800
Subject: [PATCH] refactor(vip): 更新会员总积分字段名称
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index cce24d7..205e088 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -21,6 +21,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -110,43 +111,47 @@
happyMemberLevelLambdaQueryWrapper.eq(HappyMemberLevel::getCode, director);
happyMemberLevelLambdaQueryWrapper.last("limit 1");
HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(happyMemberLevelLambdaQueryWrapper);
+ log.info("会员等级信息:{}", JSONUtil.toJsonStr(happyMemberLevel));
if(ObjectUtil.isNotEmpty(happyMemberLevel)){
// 计算自己获得的积分
BigDecimal minePercent = happyMemberLevel.getMinePercent();
- BigDecimal mineScore = amount.multiply(minePercent.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_DOWN)).setScale(0, RoundingMode.HALF_DOWN);
- if(BigDecimal.ZERO.compareTo(mineScore) < 0){
- recommendScoreMap.put(memberId, mineScore);
- recommendTypeScoreMap.put(memberId, ScoreFlowTypeEnum.MINE_RECOMMEND.getValue());
+ BigDecimal mineScore = amount.multiply(minePercent).setScale(0, RoundingMode.HALF_DOWN);
+ log.info("下单获得积分:{}", mineScore);
+ if(mineScore.compareTo(BigDecimal.ZERO) > 0){
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ mineScore,
+ ScoreFlowTypeEnum.MINE_RECOMMEND.getValue(),
+ mallOrderInfo.getOrderNo(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format( ScoreFlowTypeEnum.MINE_RECOMMEND.getDesc(),mineScore),
+ 2);
+ mallMemberWalletService.add(mineScore,memberId , "prizeScore");
}
// 计算推荐人获得的积分
if(StrUtil.isNotEmpty(member.getReferrerId())){
MallMember refMember = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
BigDecimal otherPercent = happyMemberLevel.getOtherPercent();
- BigDecimal otherScore = amount.multiply(otherPercent.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_DOWN)).setScale(0, RoundingMode.HALF_DOWN);
- if(BigDecimal.ZERO.compareTo(otherScore) < 0){
- recommendScoreMap.put(refMember.getId(), otherScore);
- recommendTypeScoreMap.put(memberId, ScoreFlowTypeEnum.OTHER_RECOMMEND.getValue());
+ BigDecimal otherScore = amount.multiply(otherPercent).setScale(0, RoundingMode.HALF_DOWN);
+ log.info("推荐人获得积分:{}", otherScore);
+ if(otherScore.compareTo(BigDecimal.ZERO) > 0){
+ mallMoneyFlowService.addMoneyFlow(
+ refMember.getId(),
+ otherScore,
+ ScoreFlowTypeEnum.OTHER_RECOMMEND.getValue(),
+ mallOrderInfo.getOrderNo(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format( ScoreFlowTypeEnum.OTHER_RECOMMEND.getDesc(),otherScore),
+ 2);
+ mallMemberWalletService.add(otherScore,refMember.getId() , "prizeScore");
}
}
}
- // 为推荐人和自己添加积分流动记录和更新钱包
- recommendScoreMap.forEach((key, value) -> {
- if (value != null) {
- mallMoneyFlowService.addMoneyFlow(
- key,
- value,
- recommendTypeScoreMap.get(key),
- mallOrderInfo.getOrderNo(),
- FlowTypeEnum.PRIZE_SCORE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.getDescByValue(recommendTypeScoreMap.get(key)),value),
- 2);
- mallMemberWalletService.add(value, key, "prizeScore");
- }
- });
-
// 发送会员等级升级消息
agentProducer.sendVipLevelUp(orderId);
+ // 发送分销等级升级消息
+ agentProducer.sendSaleLevelUp(orderId);
}
@@ -211,9 +216,6 @@
member.setDirector(code);
// 更新会员信息
mallMemberMapper.updateById(member);
-
- // 发送分销等级升级消息
- agentProducer.sendSaleLevelUp(orderId);
}
/**
@@ -275,8 +277,9 @@
return;
}
// 计算返佣金额
- BigDecimal divide = happySaleLevel.getReturnPercent().divide(new BigDecimal(100));
- BigDecimal multiply = mallOrderInfo.getAmount().multiply(divide).setScale(2, RoundingMode.HALF_DOWN);
+ BigDecimal returnPercent = happySaleLevel.getReturnPercent();
+ BigDecimal multiply = mallOrderInfo.getAmount().multiply(returnPercent).setScale(2, RoundingMode.HALF_DOWN);
+ log.info("团长获得返佣：{}",multiply);
// 如果返佣金额小于等于0，则直接返回
if(BigDecimal.ZERO.compareTo(multiply) >=0){
return;
@@ -291,12 +294,13 @@
multiply,
ScoreFlowTypeEnum.SALE_RECOMMEND.getValue(),
mallOrderInfo.getOrderNo(),
- FlowTypeEnum.BALANCE.getValue(),
+ FlowTypeEnum.COMMISSION.getValue(),
StrUtil.format(ScoreFlowTypeEnum.SALE_RECOMMEND.getDesc(),multiply),
2
);
// 更新会员钱包中的余额
- mallMemberWalletService.add(multiply, storeMasterMember.getId(), "balance");
+ mallMemberWalletService.add(multiply, storeMasterMember.getId(), "commission");
+ mallMemberWalletService.add(multiply, storeMasterMember.getId(), "totalScore");
MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
mallAchieveRecord.setMemberId(mallOrderInfo.getMemberId());
--
Gitblit v1.9.1