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 | 174 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 55 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 c62a9f9..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,16 +1,15 @@
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.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;
import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.mapper.MallVipConfigMapper;
@@ -18,6 +17,8 @@
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;
import lombok.extern.slf4j.Slf4j;
@@ -25,8 +26,9 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -39,11 +41,19 @@
private final IApiMallMemberWalletService mallMemberWalletService;
private final MallMemberMapper mallMemberMapper;
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;
}
@@ -51,6 +61,7 @@
Long memberId = mallOrderInfo.getMemberId();
MallVipBenefits mallVipBenefits = mallVipConfigService.hasVipBenefits(memberId);
+ MallMember member = mallMemberMapper.selectById(memberId);
BigDecimal multiple = BigDecimal.ONE;
String name = "";
if (mallVipBenefits != null) {
@@ -58,12 +69,60 @@
name = mallVipBenefits.getName();
}
- double sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).mapToDouble(BigDecimal::doubleValue).sum();
+ List<String> skuNames = mallOrderInfo.getItems().stream().map(MallOrderItem::getSkuName).collect(Collectors.toList());
+// 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();
- mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), name, 2);
- mallMemberWalletService.add(new BigDecimal(score), memberId, "prize_score");
+ 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()
+ .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 (ObjectUtil.isEmpty(mallGoods)) {
+ 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());
+ recommendScore = recommendScore == null ? BigDecimal.ZERO : recommendScore;
+ recommendScore = recommendScore.add(item.getAmount().multiply(multi));
+
+ recommendScoreMap.put(mallMember.getId(), recommendScore);
+ }
+ });
+
+ recommendScoreMap.forEach((key, value) -> {
+ 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");
+ }
+ });
+
}
@Override
@@ -85,57 +144,62 @@
return;
}
- LambdaQueryWrapper<MallVipConfig> configQuery = new LambdaQueryWrapper<>();
- configQuery.gt(MallVipConfig::getLevel, config.getLevel())
- .orderByAsc(MallVipConfig::getLevel)
- .last("limit 1");
- MallVipConfig nextLevel = mallVipConfigMapper.selectOne(configQuery);
+// LambdaQueryWrapper<MallVipConfig> configQuery = new LambdaQueryWrapper<>();
+// configQuery.gt(MallVipConfig::getLevel, config.getLevel())
+// .orderByAsc(MallVipConfig::getLevel)
+// .last("limit 1");
+// MallVipConfig nextLevel = mallVipConfigMapper.selectOne(configQuery);
- // 指定商品
- if (nextLevel.getType() == 1) {
- boolean hasMatch = mallOrderInfo.getItems().stream().anyMatch(item -> {
- return item.getGoodsId().equals(nextLevel.getTargetId());
- });
+ List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
- if (!hasMatch) {
- log.info("未购买指定商品");
- return;
+ String nextLevelCode = "";
+ for (MallVipConfig nextLevel : configs) {
+ if (config.getLevel() >= nextLevel.getLevel()) {
+ continue;
}
- MallMember update = new MallMember();
- update.setId(member.getId());
- update.setLevel(nextLevel.getCode());
- mallMemberMapper.updateById(update);
- return;
+ // 指定商品
+ if (nextLevel.getType() == 1) {
+ boolean hasMatch = mallOrderInfo.getItems().stream().anyMatch(item -> {
+ return item.getGoodsId().equals(nextLevel.getTargetId());
+ });
+
+ if (hasMatch) {
+ nextLevelCode = nextLevel.getCode();
+ continue;
+ }
+ }
+
+ // 时间区间内金额
+ if (nextLevel.getType() == 2) {
+ Date endTime = DateUtil.endOfDay(new Date());
+ Date startTime = getStartTime(nextLevel.getValidType());
+
+ LambdaQueryWrapper<MallOrderInfo> query = new LambdaQueryWrapper<>();
+ query.ge(MallOrderInfo::getReceivingTime, startTime)
+ .le(MallOrderInfo::getReceivingTime, endTime)
+ .eq(MallOrderInfo::getStatus, 4)
+ .eq(MallOrderInfo::getMemberId, member.getId());
+ List<MallOrderInfo> orderList = mallOrderInfoMapper.selectList(query);
+ if (CollUtil.isEmpty(orderList)) {
+ continue;
+ }
+
+ double totalAmount = orderList.stream().mapToDouble(item -> {
+ return item.getAmount().doubleValue();
+ }).sum();
+
+ if (nextLevel.getAmount().compareTo(BigDecimal.valueOf(totalAmount)) <= 0) {
+ nextLevelCode = nextLevel.getCode();
+ }
+ }
}
- //
- if (nextLevel.getType() == 2) {
- Date endTime = DateUtil.endOfDay(new Date());
- Date startTime = getStartTime(nextLevel.getValidType());
-
- LambdaQueryWrapper<MallOrderInfo> query = new LambdaQueryWrapper<>();
- query.ge(MallOrderInfo::getReceivingTime, startTime)
- .le(MallOrderInfo::getReceivingTime, endTime)
- .eq(MallOrderInfo::getStatus, 4)
- .eq(MallOrderInfo::getMemberId, member.getId());
- List<MallOrderInfo> orderList = mallOrderInfoMapper.selectList(query);
- if (CollUtil.isEmpty(orderList)) {
- return;
- }
-
- double totalAmount = orderList.stream().mapToDouble(item -> {
- return item.getAmount().doubleValue();
- }).sum();
-
- if (nextLevel.getAmount().compareTo(BigDecimal.valueOf(totalAmount)) > 0) {
- log.info("未达到指定金额:{}, {}", nextLevel.getAmount(), totalAmount);
- return;
- }
-
+ if (StrUtil.isNotBlank(nextLevelCode)) {
MallMember update = new MallMember();
update.setId(member.getId());
- update.setLevel(nextLevel.getCode());
+ update.setLevel(nextLevelCode);
+ update.setVipLevelTime(new Date());
mallMemberMapper.updateById(update);
}
}
--
Gitblit v1.9.1