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 | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 390614e..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
@@ -1,17 +1,24 @@
package com.mzl.flower.service.menber.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.dto.request.menber.MemberDTO;
+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.member.MemberMapper;
import com.mzl.flower.service.menber.MemberService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
* @author fanghaowei
@@ -21,6 +28,7 @@
* @description 会员管理功能逻辑层
*/
@Service
+@Transactional
@RequiredArgsConstructor
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
@@ -31,6 +39,24 @@
if (StringUtils.isEmpty(member.getName())) {
throw new ValidationException("会员等级名称不能为空");
}
+
+ 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)) {
@@ -45,9 +71,9 @@
if (memberInfo == null) {
throw new ValidationException("会员等级信息不存在");
}
- if (!memberInfo.getCreateBy().equals(SecurityUtils.getUserId())) {
- throw new ValidationException("无权限修改");
- }
+// if (!memberInfo.getCreateBy().equals(SecurityUtils.getUserId())) {
+// throw new ValidationException("无权限修改");
+// }
Member memberTemp = memberMapper.getMemberByName(memberDTO.getName());
//判断如果按照会员等级查询到得名称和当前得Id不一致，不能修改。
if (!ObjectUtils.isEmpty(memberTemp)) {
@@ -70,4 +96,11 @@
// TODO: 2024/8/26 如果当前会员绑定了优惠券，不能删除，等优惠券逻辑完成。
memberMapper.deleteById(id);
}
+
+ @Override
+ public Page<MemberVO> queryPage(MemberQueryDTO memberQueryDTO, Page page) {
+ List<MemberVO> list = memberMapper.queryPage(memberQueryDTO, page);
+ page.setRecords(list);
+ return page;
+ }
}
--
Gitblit v1.9.3