From bed9ddcf9d5b0b692a5df792af7c545d31adffd6 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 20 九月 2024 15:48:29 +0800
Subject: [PATCH] 修改合伙人名称、手机
---
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