From 2b7ec842c2b0fff4b872084e828edd5c3f5dbaf5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 九月 2024 22:51:21 +0800
Subject: [PATCH] 1.优惠券-活动优惠券-定时任务-领取时间小于当前时间,自动下架 2.优惠券-优惠券使用记录-定时任务-使用时间小于当前时间,自动过期 3.优惠券-积分优惠券-增加已领取数和未领取数

---
 src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java
index fb302df..34b83f9 100644
--- a/src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java
@@ -143,7 +143,11 @@
         Integer sumGrowth = memberGrowthRecordMapper.getSumGrowthByUsertId(userId);
         userGrowthRecordDTO.setCurrentGrowthValue(sumGrowth);
         //查询当前会员等级
-        Member member = memberMapper.getMemberByGrowthValue(sumGrowth);
+        Member member = new Member();
+        member = memberMapper.getMemberByGrowthValue(sumGrowth);
+        if (ObjectUtils.isEmpty(member)) {
+            member = memberMapper.selectById(Constants.DEFAULT_MEMBER_ID);
+        }
         userGrowthRecordDTO.setCurrentMemberLevel(member.getName());
         userGrowthRecordDTO.setCurrentDiscountType(member.getDiscountType());
         switch (member.getDiscountType()) {
@@ -166,7 +170,7 @@
                 targetMemberDTO.setTargetGap(m.getStartPoint() - sumGrowth);
                 targetMemberDTO.setTargetDiscountAmount(StringUtils.isEmpty(m.getDiscountAmount()) ? BigDecimal.ZERO : m.getDiscountAmount());
                 targetMemberDTO.setTargetDiscountType(m.getDiscountType());
-                switch (member.getDiscountType()) {
+                switch (m.getDiscountType()) {
                     case "ratio":
                         targetMemberDTO.setTargetDiscountTypeStr(Constants.DISCOUNT_TYPE.ratio.getDesc());
                         break;

--
Gitblit v1.9.3