From 03ee7fdc7085d97febb174e4aa8d53dd2fef490d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 02 Feb 2024 14:18:01 +0800
Subject: [PATCH] 购物车使用优惠卷

---
 src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java |   22 ++++++++++++++++------
 1 files changed, 16 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 baf88ea..fa1618c 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
@@ -11,6 +11,7 @@
 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 +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.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -39,6 +42,7 @@
     private final IApiMallMemberWalletService mallMemberWalletService;
     private final MallMemberMapper mallMemberMapper;
     private final MallVipConfigMapper mallVipConfigMapper;
+    private final AgentProducer agentProducer;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -58,12 +62,15 @@
             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();
 
-        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");
+        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");
+
+        agentProducer.sendVipLevelUp(orderId);
     }
 
     @Override
@@ -136,10 +143,13 @@
             }
         }
 
-        MallMember update = new MallMember();
-        update.setId(member.getId());
-        update.setLevel(nextLevelCode);
-        mallMemberMapper.updateById(update);
+        if (StrUtil.isNotBlank(nextLevelCode)) {
+            MallMember update = new MallMember();
+            update.setId(member.getId());
+            update.setLevel(nextLevelCode);
+            update.setVipLevelTime(new Date());
+            mallMemberMapper.updateById(update);
+        }
     }
 
     private Date getStartTime(String type) {

--
Gitblit v1.9.1