From 6ffd8818ebf72ec80accb96634c994f7274dce5a Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:07 +0800
Subject: [PATCH] fix:新增修改会员校验规则； add:会员成长值变化更新用户会员等级
---
src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java | 60 +++++++++++++++++++++++++++---
src/main/java/com/mzl/flower/mapper/customer/CustomerMapper.java | 20 ++++++++++
2 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/customer/CustomerMapper.java b/src/main/java/com/mzl/flower/mapper/customer/CustomerMapper.java
index d1f488e..f36c8d7 100644
--- a/src/main/java/com/mzl/flower/mapper/customer/CustomerMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/customer/CustomerMapper.java
@@ -6,6 +6,8 @@
import com.mzl.flower.dto.response.customer.CustomerDTO;
import com.mzl.flower.entity.customer.Customer;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -17,4 +19,22 @@
CustomerDTO getCurrentCustomer(@Param("userId") String userId);
void bindPartner(@Param("id") Long id, @Param("partnerId")Long partnerId, @Param("userId")String userId);
+
+ @Select("select count(1) from t_customer_info where level_id = #{levelId} and deleted = '0' ")
+ Integer getByLevelId(@Param("levelId") String levelId);
+
+ @Update("UPDATE t_customer_info c " +
+ "JOIN ( " +
+ " SELECT user_id, " +
+ " SUM(growth) as sumgrowthvalue " +
+ " FROM t_member_growth_record " +
+ " WHERE deleted = '0' " +
+ " GROUP BY user_id " +
+ " HAVING SUM(growth) > 0 " +
+ ") t1 ON c.user_id = t1.user_id " +
+ "SET c.level_id = #{levelId} " +
+ "WHERE t1.sumgrowthvalue BETWEEN #{startPoint} AND #{endPoint} ")
+ Boolean updateMemberLevelByPoint(@Param("levelId") Long levelId, @Param("startPoint") int startPoint, @Param("endPoint") int endPoint);
+
+
}
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 6978b15..1cb015c 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
@@ -9,6 +9,7 @@
import com.mzl.flower.dto.request.menber.MemberQueryDTO;
import com.mzl.flower.dto.response.member.MemberVO;
import com.mzl.flower.entity.menber.Member;
+import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.member.MemberMapper;
import com.mzl.flower.service.menber.MemberService;
import lombok.RequiredArgsConstructor;
@@ -35,12 +36,23 @@
private final MemberMapper memberMapper;
+ private final CustomerMapper customerMapper;
+
@Override
public void saveMember(Member member) {
if (StringUtils.isEmpty(member.getName())) {
throw new ValidationException("会员等级名称不能为空");
}
+ if (StringUtils.isEmpty(member.getDiscountType())) {
+ throw new ValidationException("会员折扣类型不能为空");
+ }
+ if (Constants.DISCOUNT_TYPE.amount.name().equals(member.getDiscountType()) && StringUtils.isEmpty(member.getDiscountAmount())) {
+ throw new ValidationException("会员折扣固定金额不能为空");
+ }
+ if (Constants.DISCOUNT_TYPE.ratio.name().equals(member.getDiscountType()) && StringUtils.isEmpty(member.getDiscountRatio())) {
+ throw new ValidationException("会员折扣百分比不能为空");
+ }
if (member.getStartPoint() > member.getEndPoint()) {
throw new ValidationException("成长点开始不能大于结束");
}
@@ -67,6 +79,9 @@
throw new ValidationException("会员等级名称重复");
}
memberMapper.insert(member);
+ //更新会员等级
+ customerMapper.updateMemberLevelByPoint(member.getId(), member.getStartPoint(), member.getEndPoint());
+
}
@Override
@@ -75,19 +90,50 @@
if (memberInfo == null) {
throw new ValidationException("会员等级信息不存在");
}
-// if (!memberInfo.getCreateBy().equals(SecurityUtils.getUserId())) {
-// throw new ValidationException("无权限修改");
-// }
+ if (StringUtils.isEmpty(memberDTO.getDiscountType())) {
+ throw new ValidationException("会员折扣类型不能为空");
+ }
+ if (Constants.DISCOUNT_TYPE.amount.name().equals(memberDTO.getDiscountType()) && StringUtils.isEmpty(memberDTO.getDiscountAmount())) {
+ throw new ValidationException("会员折扣固定金额不能为空");
+ }
+ if (Constants.DISCOUNT_TYPE.ratio.name().equals(memberDTO.getDiscountType()) && StringUtils.isEmpty(memberDTO.getDiscountRatio())) {
+ throw new ValidationException("会员折扣百分比不能为空");
+ }
+ if (memberDTO.getStartPoint() > memberDTO.getEndPoint()) {
+ throw new ValidationException("成长点开始不能大于结束");
+ }
+ if (!StringUtils.isEmpty(memberDTO.getDiscountRatio())) {
+ int discountRatio1 = memberDTO.getDiscountRatio().compareTo(BigDecimal.ZERO);
+ if (discountRatio1 == -1) {
+ throw new ValidationException("会员折扣百分比不能小于0");
+ }
+ int discountRatio2 = memberDTO.getDiscountRatio().compareTo(new BigDecimal(100));
+ if (discountRatio2 == 1) {
+ throw new ValidationException("会员折扣百分比不能大于100");
+ }
+ }
+ if (!StringUtils.isEmpty(memberDTO.getDiscountAmount())) {
+ int discountAmount = memberDTO.getDiscountAmount().compareTo(BigDecimal.ZERO);
+ if (discountAmount == -1) {
+ throw new ValidationException("会员折扣固定金额不能小于0");
+ }
+ }
Member memberTemp = memberMapper.getMemberByName(memberDTO.getName());
//判断如果按照会员等级查询到得名称和当前得Id不一致，不能修改。
if (!ObjectUtils.isEmpty(memberTemp)) {
- if (memberTemp.getName().equals(memberDTO.getName())) {
+ if (memberTemp.getId() != memberDTO.getId()) {
throw new ValidationException("已存在会员等级名称，无法修改");
}
}
+ //更新会员等级
+ if (memberInfo.getStartPoint() != memberDTO.getStartPoint() || memberInfo.getEndPoint() != memberDTO.getEndPoint()) {
+ customerMapper.updateMemberLevelByPoint(memberInfo.getId(), memberInfo.getStartPoint(), memberInfo.getEndPoint());
+ }
+
BeanUtils.copyProperties(memberDTO,memberInfo);
memberInfo.update(SecurityUtils.getUserId());
memberMapper.updateById(memberInfo);
+
}
@Override
@@ -99,8 +145,10 @@
if (member == null) {
throw new ValidationException("会员等级信息不存在");
}
-
- // TODO: 2024/8/26 如果当前会员绑定了优惠券，不能删除，等优惠券逻辑完成。
+ Integer levelId = customerMapper.getByLevelId(id);
+ if (levelId > 0) {
+ throw new ValidationException("当前会员等级用户已使用，无法删除");
+ }
memberMapper.deleteById(id);
}
--
Gitblit v1.9.3