Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 in...

Cui Zhi Feng

2024-08-29 9f1412bc3afa8f16d13d9948b547c8748e02869a

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

@@ -10,6 +10,7 @@
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;

@@ -21,6 +22,7 @@
 * @description 会员管理功能逻辑层
 */
@Service
@Transactional
@RequiredArgsConstructor
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {

@@ -28,11 +30,11 @@

    @Override
    public void saveMember(Member member) {
        if (StringUtils.isEmpty(member.getLevelName())) {
        if (StringUtils.isEmpty(member.getName())) {
            throw new ValidationException("会员等级名称不能为空");
        }
        //保存时判断是否有重复的名称
        Member memberByName = memberMapper.getMemberByName(member.getLevelName());
        Member memberByName = memberMapper.getMemberByName(member.getName());
        if (!ObjectUtils.isEmpty(memberByName)) {
            throw new ValidationException("会员等级名称重复");
        }
@@ -48,10 +50,10 @@
        if (!memberInfo.getCreateBy().equals(SecurityUtils.getUserId())) {
            throw new ValidationException("无权限修改");
        }
        Member memberTemp = memberMapper.getMemberByName(memberDTO.getLevelName());
        Member memberTemp = memberMapper.getMemberByName(memberDTO.getName());
        //判断如果按照会员等级查询到得名称和当前得Id不一致，不能修改。
        if (!ObjectUtils.isEmpty(memberTemp)) {
            if (memberTemp.getLevelName().equals(memberDTO.getLevelName())) {
            if (memberTemp.getName().equals(memberDTO.getName())) {
                throw new ValidationException("已存在会员等级名称，无法修改");
            }
        }