From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 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 34b83f9..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
@@ -160,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)) {
@@ -179,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