From eb57efc4e28a2771fec52a261d0a74ca73dffec2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 15:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 eab23d3..710513c 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
@@ -17,6 +17,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -39,9 +40,23 @@
throw new ValidationException("会员等级名称不能为空");
}
- if (member.getStartPoint()>member.getEndPoint()) {
+ if (member.getStartPoint() > member.getEndPoint()) {
throw new ValidationException("成长点开始不能大于结束");
}
+
+ int discountRatio1 = member.getDiscountRatio().compareTo(BigDecimal.ZERO);
+ if (discountRatio1 == -1) {
+ throw new ValidationException("会员折扣百分比不能小于0");
+ }
+ int discountRatio2 = member.getDiscountRatio().compareTo(new BigDecimal(100));
+ if (discountRatio2 == 1) {
+ throw new ValidationException("会员折扣百分比不能大于100");
+ }
+ int discountAmount = member.getDiscountAmount().compareTo(BigDecimal.ZERO);
+ if (discountAmount == -1) {
+ throw new ValidationException("会员折扣固定金额不能小于0");
+ }
+
//保存时判断是否有重复的名称
Member memberByName = memberMapper.getMemberByName(member.getName());
if (!ObjectUtils.isEmpty(memberByName)) {
--
Gitblit v1.9.3