Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-02 0d864c9bf892fd7c56600e197072e07c57847b34

 src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java

@@ -4,6 +4,7 @@
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.constant.Constants;
import com.mzl.flower.dto.request.menber.MemberDTO;
import com.mzl.flower.dto.request.menber.MemberQueryDTO;
import com.mzl.flower.dto.response.member.MemberVO;
@@ -17,6 +18,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -39,9 +41,26 @@
            throw new ValidationException("会员等级名称不能为空");
        }

        if (member.getStartPoint()>member.getEndPoint()) {
        if (member.getStartPoint() > member.getEndPoint()) {
            throw new ValidationException("成长点开始不能大于结束");
        }
        if (!StringUtils.isEmpty(member.getDiscountRatio())) {
            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");
            }
        }
        if (!StringUtils.isEmpty(member.getDiscountAmount())) {
            int discountAmount = member.getDiscountAmount().compareTo(BigDecimal.ZERO);
            if (discountAmount == -1) {
                throw new ValidationException("会员折扣固定金额不能小于0");
            }
        }

        //保存时判断是否有重复的名称
        Member memberByName = memberMapper.getMemberByName(member.getName());
        if (!ObjectUtils.isEmpty(memberByName)) {
@@ -73,6 +92,9 @@

    @Override
    public void deleteMember(String id) {
        if(id.equals(Constants.DEFAULT_MEMBER_ID)){
            throw new ValidationException("默认普通会员只能编辑，不能删除");
        }
        Member member = memberMapper.selectById(id);
        if (member == null) {
            throw new ValidationException("会员等级信息不存在");