From 39b3fc3da32d5c8655baf6741e14517f53a769f8 Mon Sep 17 00:00:00 2001
From: his-uncles-father <88386378@qq.com>
Date: 星期四, 01 四月 2021 14:38:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java b/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java
index a93d389..305a82c 100644
--- a/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java
+++ b/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java
@@ -12,7 +12,6 @@
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
import com.java110.dto.staffAppAuth.StaffAppAuthDto;
-import com.java110.dto.store.StoreUserDto;
import com.java110.dto.user.UserDto;
import com.java110.entity.order.Business;
import com.java110.entity.wechat.Content;
@@ -74,9 +73,6 @@
@Autowired
private IRoomRenovationsInnerServiceSMO roomRenovationsInnerServiceSMO;
-
- @Autowired
- private IStoreInnerServiceSMO storeInnerServiceSMO;
private static Logger logger = LoggerFactory.getLogger(MachineSaveRoomRenovation.class);
@@ -190,6 +186,8 @@
}
/**
+ * 缁欎笟涓昏嚜宸辨帹閫佹秷鎭�
+ *
* @param paramIn
* @param communityDto
*/
@@ -245,16 +243,16 @@
RoomRenovationDto roomRenovationDto = new RoomRenovationDto();
roomRenovationDto.setRoomId(roomId);
List<RoomRenovationDto> roomRenovationDtos = roomRenovationsInnerServiceSMO.queryRoomRenovations(roomRenovationDto);
- //鑾峰彇褰撳墠鐢ㄦ埛id
- String userId = paramIn.getString("userId");
- StoreUserDto storeUserDto = new StoreUserDto();
- storeUserDto.setUserId(userId);
- //鏌ヨ鍟嗘埛鍛樺伐淇℃伅
- List<StoreUserDto> storeUsers = storeInnerServiceSMO.getStoreUserInfo(storeUserDto);
- //鑾峰彇鍟嗘埛鎵嬫満鍙�
+ //鏌ヨ褰撳墠缁戝畾涓氫富鎵�灞炲皬鍖�
+ String communityId = ownerAppUserDtos.get(0).getCommunityId();
+ //閫氳繃灏忓尯id鏌ヨ灏忓尯淇℃伅
+ CommunityDto community = new CommunityDto();
+ community.setCommunityId(communityId);
+ List<CommunityDto> communityDtos = communityInnerServiceSMO.queryCommunitys(community);
+ //鑾峰彇鐗╀笟鑱旂郴鏂瑰紡
String tel = null;
- if (storeUsers != null && storeUsers.size() > 0) {
- tel = storeUsers.get(0).getTel();
+ if (communityDtos != null && communityDtos.size() > 0) {
+ tel = communityDtos.get(0).getTel();
}
String[] roomName = paramIn.getString("roomName").split("-");
if (ownerAppUserDtos.size() > 0) {
--
Gitblit v1.8.0