From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java b/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java
index 178dcd8..9477a69 100644
--- a/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java
+++ b/service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java
@@ -11,7 +11,6 @@
import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
-import com.java110.dto.store.StoreUserDto;
import com.java110.entity.order.Business;
import com.java110.entity.wechat.Content;
import com.java110.entity.wechat.Data;
@@ -20,7 +19,6 @@
import com.java110.intf.community.IRoomRenovationDetailInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
-import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
@@ -70,9 +68,6 @@
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMO;
-
- @Autowired
- private IStoreInnerServiceSMO storeInnerServiceSMO;
@Autowired
private RestTemplate outRestTemplate;
@@ -188,16 +183,16 @@
ownerAppUserDto.setAppType("WECHAT");
//鏌ヨ缁戝畾涓氫富
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMO.queryOwnerAppUsers(ownerAppUserDto);
- //鑾峰彇褰撳墠鐢ㄦ埛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[] roomNames = paramIn.getString("roomName").split("-");
if (ownerAppUserDtos.size() > 0) {
@@ -222,5 +217,4 @@
logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
}
}
-
}
--
Gitblit v1.8.0