From f7e21dcf6f2f6a22ea64043048da35589db701d9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 11 Dec 2024 11:21:39 +0800
Subject: [PATCH] feat(vip): 优化积分计算逻辑
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 d514a17..4c9984d 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
@@ -1,7 +1,6 @@
package cc.mrbird.febs.vip.service.impl;
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;
@@ -11,7 +10,6 @@
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;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cc.mrbird.febs.vip.entity.MallVipBenefits;
@@ -21,6 +19,7 @@
import cc.mrbird.febs.vip.service.IVipCommonService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
@@ -34,7 +33,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.logging.Handler;
import java.util.stream.Collectors;
@Slf4j
@@ -70,23 +68,36 @@
name = mallVipBenefits.getName();
}
+
List<String> skuNames = mallOrderInfo.getItems().stream().map(MallOrderItem::getSkuName).collect(Collectors.toList());
double sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).mapToDouble(BigDecimal::doubleValue).sum();
int score = multiple.multiply(BigDecimal.valueOf(sum)).intValue();
+ log.info("会员：{}，购买商品：{}，购买金额：{}，会员等级：{}，会员等级名称：{}，会员等级积分倍数：{}，会员获得积分：{}",
+ member.getName(),
+ skuNames,
+ sum,
+ member.getLevel(),
+ name,
+ multiple,
+ score);
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, MallGoods> goodsMap = goodsList.stream()
+ .filter(
+ goods -> ObjectUtil.isNotEmpty(goods.getStaticMulti())
+ )
+ .collect(Collectors.toMap(MallGoods::getId, MallGoods -> MallGoods));
Map<Long, BigDecimal> recommendScoreMap = new HashMap<>();
mallOrderInfo.getItems().forEach(item -> {
if (StrUtil.isNotBlank(item.getMemberInviteId()) && !member.getInviteId().equals(item.getMemberInviteId())) {
MallGoods mallGoods = goodsMap.get(item.getGoodsId());
- if (mallGoods.getStaticMulti() == null) {
+ if (ObjectUtil.isEmpty(mallGoods)) {
return;
}
--
Gitblit v1.9.1