From 93de43267e1663031fe5dc2f5ae40d128a182a76 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 18 六月 2026 17:24:51 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 4129a20..05bea91 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/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 "));
}
--
Gitblit v1.9.3