From 9696e659c1ec3f080708536ef98c91775005247b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 08 May 2025 14:24:33 +0800
Subject: [PATCH] feat(mall): 增加会员等级和分销等级设置功能 - 新增会员等级和分销等级设置页面 - 实现会员等级和分销等级的更新逻辑 - 优化会员列表页面,增加相关筛选条件 - 调整数据库查询以支持新的筛选条件

---
 src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java |   13 +++++++------
 1 files changed, 7 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 19b1de4..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
@@ -97,17 +97,18 @@
                 }
 
                 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);

--
Gitblit v1.9.1