From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 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 19b1de4..4714f0b 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,17 +1,13 @@
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;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.entity.MallOrderItem;
+import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.mapper.MallOrderItemMapper;
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 +17,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;
@@ -30,11 +27,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Handler;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -50,11 +43,17 @@
private final MallVipConfigMapper mallVipConfigMapper;
private final AgentProducer agentProducer;
private final IApiMallGoodsService mallGoodsService;
+ private final MallOrderItemMapper mallOrderItemMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public void getScore(Long orderId) {
- MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOrderDetailsById(orderId);
+// MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOrderDetailsById(orderId);
+
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(mallOrderInfo.getId());
+ mallOrderInfo.setItems(mallOrderItemList);
+
if (mallOrderInfo == null) {
return;
}
@@ -71,22 +70,35 @@
}
List<String> skuNames = mallOrderInfo.getItems().stream().map(MallOrderItem::getSkuName).collect(Collectors.toList());
- double sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).mapToDouble(BigDecimal::doubleValue).sum();
+// double sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).mapToDouble(BigDecimal::doubleValue).sum();
+ BigDecimal sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
- int score = multiple.multiply(BigDecimal.valueOf(sum)).intValue();
+ int score = multiple.multiply(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;
}
@@ -97,20 +109,20 @@
}
BigDecimal recommendScore = recommendScoreMap.get(mallMember.getId());
- if (recommendScore != null) {
+ recommendScore = recommendScore == null ? BigDecimal.ZERO : recommendScore;
+ recommendScore = recommendScore.add(item.getAmount().multiply(multi));
- recommendScore = recommendScore.add(item.getAmount().multiply(multi));
- recommendScoreMap.put(mallMember.getId(), recommendScore);
- }
+ 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(value, 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);
}
@Override
--
Gitblit v1.9.1