From c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:55:58 +0800
Subject: [PATCH] refactor(mall): 优化订单收货类型判断逻辑
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 e403f53..31a2347 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
@@ -42,6 +42,7 @@
public class VipCommonServiceImpl implements IVipCommonService {
private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final MallOrderItemMapper mallOrderItemMapper;
private final IMallVipConfigService mallVipConfigService;
private final IMallMoneyFlowService mallMoneyFlowService;
private final IApiMallMemberWalletService mallMemberWalletService;
@@ -127,7 +128,7 @@
mallMemberWalletService.add(mineScore,memberId , "prizeScore");
// 记录会员购买获得的经验
- BigDecimal multiply = amount.multiply(minePercent);
+ BigDecimal multiply = amount.multiply(minePercent).setScale(2, RoundingMode.HALF_DOWN);
mallMoneyFlowService.addMoneyFlow(
memberId,
multiply,
@@ -139,6 +140,8 @@
);
// 更新会员钱包中的分数
mallMemberWalletService.add(multiply, memberId, "score");
+ // 发送会员等级升级消息
+ agentProducer.sendVipLevelUp(memberId);
}
// 计算推荐人获得的积分
if(StrUtil.isNotEmpty(member.getReferrerId())){
@@ -158,7 +161,7 @@
mallMemberWalletService.add(otherScore,refMember.getId() , "prizeScore");
// 记录会员购买获得的经验
- BigDecimal multiply = amount.multiply(otherPercent);
+ BigDecimal multiply = amount.multiply(otherPercent).setScale(2, RoundingMode.HALF_DOWN);
mallMoneyFlowService.addMoneyFlow(
refMember.getId(),
multiply,
@@ -170,12 +173,12 @@
);
// 更新会员钱包中的分数
mallMemberWalletService.add(multiply, refMember.getId(), "score");
+ // 发送会员等级升级消息
+ agentProducer.sendVipLevelUp(refMember.getId());
}
}
}
- // 发送会员等级升级消息
- agentProducer.sendVipLevelUp(orderId);
// 发送分销等级升级消息
agentProducer.sendSaleLevelUp(orderId);
}
@@ -190,20 +193,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("会员不存在");
@@ -236,6 +227,9 @@
Integer code = happyMemberLevel.getCode();
// 如果当前会员等级与会员的导演等级相同，则直接返回
if(member.getDirector() == code){
+ return;
+ }
+ if(member.getDirector() > code){
return;
}
@@ -286,7 +280,7 @@
.eq(MallMember::getAccountStatus, MallMember.ACCOUNT_STATUS_ENABLE)
.eq(MallMember::getAccountType, MallMember.ACCOUNT_TYPE_NORMAL)
.ne(MallMember::getStoreMaster, 0)
- .orderByAsc(MallMember::getStoreMaster)
+ .orderByDesc(MallMember::getId)
.last("limit 1")
);
// 如果没有找到符合条件的团长，则记录日志并返回
@@ -305,15 +299,24 @@
return;
}
// 计算返佣金额
+ List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
+ new LambdaQueryWrapper<MallOrderItem>()
+ .eq(MallOrderItem::getOrderId, orderId)
+ .eq(MallOrderItem::getState, 1)
+ );
+ if(CollUtil.isEmpty(mallOrderItems)){
+ return;
+ }
+ BigDecimal amount = mallOrderItems.stream().map(MallOrderItem::getLevelOnePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal returnPercent = happySaleLevel.getReturnPercent();
- BigDecimal multiply = mallOrderInfo.getAmount().multiply(returnPercent).setScale(2, RoundingMode.HALF_DOWN);
+ BigDecimal multiply = amount.multiply(returnPercent).setScale(2, RoundingMode.HALF_DOWN);
log.info("团长获得返佣：{}",multiply);
// 如果返佣金额小于等于0，则直接返回
if(BigDecimal.ZERO.compareTo(multiply) >=0){
return;
}
// 如果返佣金额大于等于订单金额，则直接返回
- if(multiply.compareTo(mallOrderInfo.getAmount()) >= 0){
+ if(multiply.compareTo(amount) > 0){
return;
}
// 记录团长获得返佣
--
Gitblit v1.9.1