From 9a2c841a2dfb3a5ed346d32ae50b7cfd22acbe17 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 18:34:10 +0800
Subject: [PATCH] fix(mall): 修复订单部分退款导致运费也被退的问题
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 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 7fcf385..1343f35 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
@@ -86,19 +86,6 @@
Long memberId = mallOrderInfo.getMemberId();
// 根据会员ID查询会员信息
MallMember member = mallMemberMapper.selectById(memberId);
-
- // 记录会员购买获得的经验
- mallMoneyFlowService.addMoneyFlow(
- memberId,
- amount,
- ScoreFlowTypeEnum.BUY.getValue(),
- mallOrderInfo.getOrderNo(),
- FlowTypeEnum.SCORE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.BUY.getDesc(),amount),
- 2
- );
- // 更新会员钱包中的分数
- mallMemberWalletService.add(amount, memberId, "score");
BigDecimal scorePercent = BigDecimal.ONE;
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.SCORE_SIGN_SETTING.getType(),
@@ -138,6 +125,22 @@
StrUtil.format( ScoreFlowTypeEnum.MINE_RECOMMEND.getDesc(),mineScore),
2);
mallMemberWalletService.add(mineScore,memberId , "prizeScore");
+
+ // 记录会员购买获得的经验
+ BigDecimal multiply = amount.multiply(minePercent).setScale(2, RoundingMode.HALF_DOWN);
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ multiply,
+ ScoreFlowTypeEnum.BUY.getValue(),
+ mallOrderInfo.getOrderNo(),
+ FlowTypeEnum.SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.BUY.getDesc(),multiply),
+ 2
+ );
+ // 更新会员钱包中的分数
+ mallMemberWalletService.add(multiply, memberId, "score");
+ // 发送会员等级升级消息
+ agentProducer.sendVipLevelUp(memberId);
}
// 计算推荐人获得的积分
if(StrUtil.isNotEmpty(member.getReferrerId())){
@@ -155,12 +158,26 @@
StrUtil.format( ScoreFlowTypeEnum.OTHER_RECOMMEND.getDesc(),otherScore),
2);
mallMemberWalletService.add(otherScore,refMember.getId() , "prizeScore");
+
+ // 记录会员购买获得的经验
+ BigDecimal multiply = amount.multiply(otherPercent).setScale(2, RoundingMode.HALF_DOWN);
+ mallMoneyFlowService.addMoneyFlow(
+ refMember.getId(),
+ multiply,
+ ScoreFlowTypeEnum.BUY.getValue(),
+ mallOrderInfo.getOrderNo(),
+ FlowTypeEnum.SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.BUY.getDesc(),multiply),
+ 2
+ );
+ // 更新会员钱包中的分数
+ mallMemberWalletService.add(multiply, refMember.getId(), "score");
+ // 发送会员等级升级消息
+ agentProducer.sendVipLevelUp(refMember.getId());
}
}
}
- // 发送会员等级升级消息
- agentProducer.sendVipLevelUp(orderId);
// 发送分销等级升级消息
agentProducer.sendSaleLevelUp(orderId);
}
@@ -175,20 +192,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void levelUp(Long orderId) {
- // 根据订单ID获取订单详细信息
- MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOrderDetailsById(orderId);
- // 如果订单信息为空，则直接返回
- if (mallOrderInfo == null) {
- return;
- }
- // 如果订单状态不是完成状态，则直接返回
- if (mallOrderInfo.getStatus() != OrderStatusEnum.FINISH.getValue()) {
- // 订单不是完成状态
- return;
- }
-
// 根据订单中的会员ID获取会员信息
- MallMember member = mallMemberMapper.selectById(mallOrderInfo.getMemberId());
+ MallMember member = mallMemberMapper.selectById(orderId);
// 如果会员信息为空，则记录日志并返回
if (member == null) {
log.info("会员不存在");
@@ -223,6 +228,9 @@
if(member.getDirector() == code){
return;
}
+ if(member.getDirector() > code){
+ return;
+ }
// 更新会员的导演等级为当前会员等级代码
member.setDirector(code);
--
Gitblit v1.9.1