From 5bb359883bda6f15b6a6937a2c17ac9bbc67ab8e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 22 九月 2024 17:17:24 +0800
Subject: [PATCH] add:会员成长值规则

---
 src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java |   10 ++++++++--
 1 files changed, 8 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..defb2a4 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()) {
@@ -156,6 +160,7 @@
         }
         userGrowthRecordDTO.setCurrentDiscountRatio(StringUtils.isEmpty(member.getDiscountRatio()) ? BigDecimal.valueOf(100) : member.getDiscountRatio());
         userGrowthRecordDTO.setCurrentDiscountAmount(StringUtils.isEmpty(member.getDiscountAmount()) ? BigDecimal.ZERO  : member.getDiscountAmount());
+        userGrowthRecordDTO.setCurrentGrowthValueDesc(member.getGrowthValueDesc());
         //查询比当前等级高的会员等级信息
         List<Member> memberList = memberMapper.getgtMembersByGrowthValue(sumGrowth);
         if (!CollectionUtils.isEmpty(memberList)) {
@@ -166,7 +171,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;
@@ -175,6 +180,7 @@
                         break;
                 }
                 targetMemberDTO.setTargetDiscountRatio(StringUtils.isEmpty(m.getDiscountRatio()) ? BigDecimal.valueOf(100) : m.getDiscountRatio());
+                targetMemberDTO.setTargetGrowthValueDesc(m.getGrowthValueDesc());
                 targetMemberDTOList.add(targetMemberDTO);
             });
         }

--
Gitblit v1.9.3