新增智能电表、空调管理

doum

2026-06-18 93de43267e1663031fe5dc2f5ae40d128a182a76

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

@@ -176,13 +176,6 @@
    }

    private YwCustomer findMerchantByPhone(String phone) {
        YwCustomer byCustomerPhone = ywCustomerMapper.selectOne(new QueryWrapper<YwCustomer>().lambda()
                .eq(YwCustomer::getIsdeleted, Constants.ZERO)
                .eq(YwCustomer::getPhone, phone)
                .last(" limit 1 "));
        if (byCustomerPhone != null) {
            return byCustomerPhone;
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                .eq(Member::getIsdeleted, Constants.ZERO)
                .eq(Member::getType, Constants.memberType.customer)
@@ -190,19 +183,22 @@
                .isNotNull(Member::getCustomerId)
                .orderByDesc(Member::getId)
                .last(" limit 1 "));
        if (member == null || member.getCustomerId() == null) {
            return null;
        }
        YwCustomer customer = ywCustomerMapper.selectOne(new QueryWrapper<YwCustomer>().lambda()
                .eq(YwCustomer::getId, member.getCustomerId())
                .eq(YwCustomer::getIsdeleted, Constants.ZERO)
                .last(" limit 1 "));
        if (customer != null) {
            return customer;
        if (member != null && member.getCustomerId() != null) {
            YwCustomer customer = ywCustomerMapper.selectOne(new QueryWrapper<YwCustomer>().lambda()
                    .eq(YwCustomer::getId, member.getCustomerId())
                    .eq(YwCustomer::getIsdeleted, Constants.ZERO)
                    .last(" limit 1 "));
            if (customer != null) {
                return customer;
            }
            return ywCustomerMapper.selectOne(new QueryWrapper<YwCustomer>().lambda()
                    .eq(YwCustomer::getIsdeleted, Constants.ZERO)
                    .eq(YwCustomer::getMemberId, member.getId())
                    .last(" limit 1 "));
        }
        return ywCustomerMapper.selectOne(new QueryWrapper<YwCustomer>().lambda()
                .eq(YwCustomer::getIsdeleted, Constants.ZERO)
                .eq(YwCustomer::getMemberId, member.getId())
                .eq(YwCustomer::getPhone, phone)
                .last(" limit 1 "));
    }