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

陶杰

2024-09-02 b977bf61c82b7dc39079974d7316b7a80cf520fa

 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;
@@ -43,18 +44,21 @@
        if (member.getStartPoint() > member.getEndPoint()) {
            throw new ValidationException("成长点开始不能大于结束");
        }

        int discountRatio1 = member.getDiscountRatio().compareTo(BigDecimal.ZERO);
        if (discountRatio1 == -1) {
            throw new ValidationException("会员折扣百分比不能小于0");
        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");
            }
        }
        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");
        if (!StringUtils.isEmpty(member.getDiscountAmount())) {
            int discountAmount = member.getDiscountAmount().compareTo(BigDecimal.ZERO);
            if (discountAmount == -1) {
                throw new ValidationException("会员折扣固定金额不能小于0");
            }
        }

        //保存时判断是否有重复的名称
@@ -88,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("会员等级信息不存在");