From ea689dd91eaa72425dc01759042c3b4eb2186512 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:14:44 +0800
Subject: [PATCH] 新增智能电表、空调管理

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
index 303b8f0..e9cdf1a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
+++ b/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);
     }
 

--
Gitblit v1.9.3