|
|
@@ -277,7 +277,8 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
|
|
|
hotel.setRoom_number_calc(mhd.get().getTotalHouseNum().toString());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ AdminManager adminManager = adminManagerService.getById(hotel.getManagerId());
|
|
|
+ hotel.setType(String.valueOf(adminManager.getType()));
|
|
|
Optional<HotelPriceOneDataVo> one = newOneDatas.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
|
|
|
Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
|
|
|
if (one != null && one.isPresent() && min != null && min.isPresent()) {
|
|
|
@@ -454,6 +455,9 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
|
|
|
Hotel hotel = appHomePageService.getHotelAndHouseByHotelId(hotelId, startDate, endDate);
|
|
|
hotel.setHotelFileInfoList(fileService.queryListByLinkId(hotel.getManagerId() + ""));
|
|
|
|
|
|
+ AdminManager adminManager = adminManagerService.getById(hotel.getManagerId());
|
|
|
+ hotel.setType(String.valueOf(adminManager.getType()));
|
|
|
+
|
|
|
// 添加是否已收藏的酒店
|
|
|
if (!Func.checkNull(userId))
|
|
|
hotel = appHomePageService.assignCollect(userId, hotel);
|
|
|
@@ -546,6 +550,9 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
|
|
|
}
|
|
|
hotel.setHotelFileInfoList(fileService.queryListByLinkId(hotel.getManagerId() + ""));
|
|
|
|
|
|
+ AdminManager adminManager = adminManagerService.getById(hotel.getManagerId());
|
|
|
+ hotel.setType(String.valueOf(adminManager.getType()));
|
|
|
+
|
|
|
// 添加是否已收藏的酒店
|
|
|
if (!Func.checkNull(userId))
|
|
|
appHomePageService.assignCollect(userId, hotel);
|