From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 14:43:59 +0800
Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券，发布的时候将已经发布的设置为下架，只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取，超过领取优惠券的话则不返回数据
---
src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 935da0b..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,8 +143,23 @@
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()) {
+ case "ratio":
+ userGrowthRecordDTO.setCurrentDiscountTypeStr(Constants.DISCOUNT_TYPE.ratio.getDesc());
+ break;
+ case "amount":
+ userGrowthRecordDTO.setCurrentDiscountTypeStr(Constants.DISCOUNT_TYPE.amount.getDesc());
+ break;
+ }
+ userGrowthRecordDTO.setCurrentDiscountRatio(StringUtils.isEmpty(member.getDiscountRatio()) ? BigDecimal.valueOf(100) : member.getDiscountRatio());
+ userGrowthRecordDTO.setCurrentDiscountAmount(StringUtils.isEmpty(member.getDiscountAmount()) ? BigDecimal.ZERO : member.getDiscountAmount());
//查询比当前等级高的会员等级信息
List<Member> memberList = memberMapper.getgtMembersByGrowthValue(sumGrowth);
if (!CollectionUtils.isEmpty(memberList)) {
@@ -153,7 +168,17 @@
targetMemberDTO.setTargetMemberLevel(m.getName());
targetMemberDTO.setTargetStartPoint(m.getStartPoint());
targetMemberDTO.setTargetGap(m.getStartPoint() - sumGrowth);
- targetMemberDTO.setTargetDiscountAmount(m.getDiscountAmount());
+ targetMemberDTO.setTargetDiscountAmount(StringUtils.isEmpty(m.getDiscountAmount()) ? BigDecimal.ZERO : m.getDiscountAmount());
+ targetMemberDTO.setTargetDiscountType(m.getDiscountType());
+ switch (m.getDiscountType()) {
+ case "ratio":
+ targetMemberDTO.setTargetDiscountTypeStr(Constants.DISCOUNT_TYPE.ratio.getDesc());
+ break;
+ case "amount":
+ targetMemberDTO.setTargetDiscountTypeStr(Constants.DISCOUNT_TYPE.amount.getDesc());
+ break;
+ }
+ targetMemberDTO.setTargetDiscountRatio(StringUtils.isEmpty(m.getDiscountRatio()) ? BigDecimal.valueOf(100) : m.getDiscountRatio());
targetMemberDTOList.add(targetMemberDTO);
});
}
--
Gitblit v1.9.3