From ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 27 九月 2024 16:26:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java b/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
index 16fcf32..9cf0d44 100644
--- a/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
@@ -42,12 +42,12 @@
public void saveMember(MemberDTO memberDTO) {
//是否已经存在endpoint已经有最大值了，有的话需要删除或者修改
if (memberDTO.getEndPoint() == null) {
- Member pointByIntegerMaxValue = memberMapper.getEndPointByIntegerMaxValue(Integer.MAX_VALUE);
- if (!ObjectUtils.isEmpty(pointByIntegerMaxValue)) {
- throw new ValidationException("系统中已经有一条最大值或者空值记录，请删除或者修改再保存");
- } else {
+// Member pointByIntegerMaxValue = memberMapper.getEndPointByIntegerMaxValue(Integer.MAX_VALUE);
+// if (!ObjectUtils.isEmpty(pointByIntegerMaxValue)) {
+// throw new ValidationException("系统中已经有一条最大值或者空值记录，请删除或者修改再保存");
+// } else {
memberDTO.setEndPoint(Integer.MAX_VALUE);
- }
+// }
}
if (StringUtils.isEmpty(memberDTO.getName())) {
throw new ValidationException("会员等级名称不能为空");
@@ -76,6 +76,14 @@
throw new ValidationException("会员折扣百分比不能大于100");
}
}
+ //区间交集判断
+ //查询所有等级
+ List<Member> allMember = memberMapper.getAllMember();
+ allMember.forEach(a -> {
+ if (a.getStartPoint() < memberDTO.getEndPoint() && a.getEndPoint() > memberDTO.getStartPoint()) {
+ throw new ValidationException("存在交集，不允许保存");
+ }
+ });
if (!StringUtils.isEmpty(memberDTO.getDiscountAmount())) {
int discountAmount = memberDTO.getDiscountAmount().compareTo(BigDecimal.ZERO);
if (discountAmount == -1) {
@@ -93,7 +101,7 @@
member.create(SecurityUtils.getUserId());
memberMapper.insert(member);
//更新会员等级
- customerMapper.updateMemberLevelByPoint(member.getId(), member.getStartPoint(), member.getEndPoint());
+ customerMapper.updateMemberLevelByPoint(member.getId(), memberDTO.getStartPoint(), memberDTO.getEndPoint());
}
@@ -163,9 +171,18 @@
if (memberDTO.getStartPoint() > memberDTO.getEndPoint()) {
throw new ValidationException("成长点开始不能大于结束");
}
+ //区间交集判断
+ //查询所有等级
+ List<Member> allMember = memberMapper.getOtherAllMember(memberDTO.getId());
+ allMember.forEach(a -> {
+ if (a.getStartPoint() < memberDTO.getEndPoint() && a.getEndPoint() > memberDTO.getStartPoint()) {
+ throw new ValidationException("存在交集，不允许修改");
+ }
+ });
+
//更新会员等级
if (memberInfo.getStartPoint() != memberDTO.getStartPoint() || memberInfo.getEndPoint() != memberDTO.getEndPoint()) {
- customerMapper.updateMemberLevelByPoint(memberInfo.getId(), memberInfo.getStartPoint(), memberInfo.getEndPoint());
+ customerMapper.updateMemberLevelByPoint(memberInfo.getId(), memberDTO.getStartPoint(), memberDTO.getEndPoint());
}
BeanUtils.copyProperties(memberDTO,memberInfo);
--
Gitblit v1.9.3