From 41460de80c39d594b3dd2ea9834cd6beb00313df Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 01 四月 2025 17:42:56 +0800
Subject: [PATCH] 物联网手机端充电订单

---
 service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java |   52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java
index 9f694b2..dffd810 100755
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java
@@ -2,19 +2,24 @@
 
 
 import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.ICommunityV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.dto.PageDto;
-import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.po.owner.OwnerAppUserPo;
 import com.java110.user.dao.IOwnerAppUserServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +41,7 @@
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
     @Autowired
-    private ICommunityInnerServiceSMO iCommunityInnerServiceSMO;
+    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
 
     @Override
     public List<OwnerAppUserDto> queryOwnerAppUsers(@RequestBody OwnerAppUserDto ownerAppUserDto) {
@@ -50,18 +55,43 @@
         }
 
         List<OwnerAppUserDto> ownerAppUsers = BeanConvertUtil.covertBeanList(ownerAppUserServiceDaoImpl.getOwnerAppUserInfo(BeanConvertUtil.beanCovertMap(ownerAppUserDto)), OwnerAppUserDto.class);
-        for (OwnerAppUserDto ownerAppUserDto1 : ownerAppUsers) {
-            CommunityDto communityDto = new CommunityDto();
-            communityDto.setCommunityId(ownerAppUserDto1.getCommunityId());
-            List<CommunityDto> communityDtoList = iCommunityInnerServiceSMO.queryCommunitys(communityDto);
-            if (communityDtoList != null && communityDtoList.size() > 0) {
-                ownerAppUserDto1.setsCommunityTel(communityDtoList.get(0).getTel());
-            }
-        }
+        queryCommunityTel(ownerAppUsers);
 
         return ownerAppUsers;
     }
 
+    private void queryCommunityTel(List<OwnerAppUserDto> ownerAppUsers) {
+
+        if(ListUtil.isNull(ownerAppUsers)){
+            return ;
+        }
+        List<String> communityIds = new ArrayList<>();
+        for (OwnerAppUserDto ownerAppUserDto : ownerAppUsers) {
+            if (StringUtil.isEmpty(ownerAppUserDto.getCommunityId()) || "-1".equals(ownerAppUserDto.getCommunityId())) {
+                continue;
+            }
+            communityIds.add(ownerAppUserDto.getCommunityId());
+        }
+        if(ListUtil.isNull(communityIds)){
+            return ;
+        }
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
+        List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
+        if(ListUtil.isNull(communityDtos)){
+            return;
+        }
+        for (OwnerAppUserDto tmpOwnerAppUserDto : ownerAppUsers) {
+            for (CommunityDto tCommunityDto : communityDtos) {
+                if (!tmpOwnerAppUserDto.getCommunityId().equals(tCommunityDto.getCommunityId())) {
+                    continue;
+                }
+                tmpOwnerAppUserDto.setCommunityName(tCommunityDto.getName());
+                tmpOwnerAppUserDto.setsCommunityTel(tCommunityDto.getTel());
+            }
+        }
+    }
+
 
     @Override
     public int queryOwnerAppUsersCount(@RequestBody OwnerAppUserDto ownerAppUserDto) {

--
Gitblit v1.8.0