From 45f3a57aa77c2addd609eec3a0823bfb08b4469a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 09 May 2025 11:21:26 +0800
Subject: [PATCH] fix(mall): 修复轮播图添加类型字段
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 be9569d..d514a17 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
@@ -3,11 +3,13 @@
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
+import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderItem;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.service.IApiMallGoodsService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
@@ -27,6 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -46,6 +49,7 @@
private final MallMemberMapper mallMemberMapper;
private final MallVipConfigMapper mallVipConfigMapper;
private final AgentProducer agentProducer;
+ private final IApiMallGoodsService mallGoodsService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -58,6 +62,7 @@
Long memberId = mallOrderInfo.getMemberId();
MallVipBenefits mallVipBenefits = mallVipConfigService.hasVipBenefits(memberId);
+ MallMember member = mallMemberMapper.selectById(memberId);
BigDecimal multiple = BigDecimal.ONE;
String name = "";
if (mallVipBenefits != null) {
@@ -73,26 +78,37 @@
mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), CollUtil.join(skuNames, ","), 2);
mallMemberWalletService.add(new BigDecimal(score), memberId, "prizeScore");
+ List<Long> itemGoodsIds = mallOrderInfo.getItems().stream().map(MallOrderItem::getGoodsId).distinct().collect(Collectors.toList());
+ List<MallGoods> goodsList = mallGoodsService.listByIds(itemGoodsIds);
+ Map<Long, MallGoods> goodsMap = goodsList.stream().collect(Collectors.toMap(MallGoods::getId, MallGoods -> MallGoods));
+
Map<Long, BigDecimal> recommendScoreMap = new HashMap<>();
mallOrderInfo.getItems().forEach(item -> {
- if (StrUtil.isNotBlank(item.getMemberInviteId())) {
+ if (StrUtil.isNotBlank(item.getMemberInviteId()) && !member.getInviteId().equals(item.getMemberInviteId())) {
+ MallGoods mallGoods = goodsMap.get(item.getGoodsId());
+ if (mallGoods.getStaticMulti() == null) {
+ return;
+ }
+
+ BigDecimal multi = mallGoods.getStaticMulti().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
MallMember mallMember = mallMemberMapper.selectInfoByInviteId(item.getMemberInviteId());
if (mallMember == null) {
return;
}
BigDecimal recommendScore = recommendScoreMap.get(mallMember.getId());
- if (recommendScore != null) {
- recommendScore = recommendScore.add(item.getAmount());
- }
+ recommendScore = recommendScore == null ? BigDecimal.ZERO : recommendScore;
+ recommendScore = recommendScore.add(item.getAmount().multiply(multi));
recommendScoreMap.put(mallMember.getId(), recommendScore);
}
});
recommendScoreMap.forEach((key, value) -> {
- mallMoneyFlowService.addMoneyFlow(key, value, ScoreFlowTypeEnum.RECOMMEND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), CollUtil.join(skuNames, ","), 2);
- mallMemberWalletService.add(new BigDecimal(score), key, "prizeScore");
+ if (value != null) {
+ mallMoneyFlowService.addMoneyFlow(key, value, ScoreFlowTypeEnum.RECOMMEND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), CollUtil.join(skuNames, ","), 2);
+ mallMemberWalletService.add(value, key, "prizeScore");
+ }
});
agentProducer.sendVipLevelUp(orderId);
--
Gitblit v1.9.1