Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

doum

2026-06-17 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java

@@ -78,6 +78,7 @@
        memberMapper.insert(member);

        ywCustomer.setMemberId(member.getId());
        ywCustomer.setPhone(member.getPhone());
        ywCustomerMapper.updateById(ywCustomer);

        return ywCustomer.getId();
@@ -94,12 +95,14 @@
        if(StringUtils.isNotBlank(member.getIdcardNo() ) && Constants.equalsInteger(member.getIdcardType(),Constants.ZERO) ){
            if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                    .eq(Member::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                    .eq(Member::getType, Constants.memberType.customer)
                    .eq(Member::getIsdeleted,Constants.ZERO)) >0){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
            }
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .eq(Member::getPhone,  member.getPhone())
                .eq(Member::getType, Constants.memberType.customer)
                .eq(Member::getIsdeleted,Constants.ZERO) ) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+member.getPhone()+"】已被使用，不能重复");
        }
@@ -108,6 +111,14 @@

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {

        //查询客户信息下是否存在人员信息
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getType,Constants.memberType.customer)
                        .eq(Member::getCustomerId,id)
                .eq(Member::getIsdeleted,Constants.ZERO))>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在人员信息未删除，请先删除客户下人员信息!");
        }

        ywCustomerMapper.deleteById(id);
    }

@@ -122,6 +133,11 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getType,Constants.memberType.customer)
                .in(Member::getCustomerId,ids)
                .eq(Member::getIsdeleted,Constants.ZERO))>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在人员信息未删除，请先删除客户下人员信息!");
        }
        ywCustomerMapper.deleteBatchIds(ids);
    }