|
@@ -1,6 +1,7 @@
|
|
|
package com.happy.action;
|
|
package com.happy.action;
|
|
|
|
|
|
|
|
import com.baidubce.model.User;
|
|
import com.baidubce.model.User;
|
|
|
|
|
+import com.happy.Model.AdminManager;
|
|
|
import com.happy.Model.Hotel;
|
|
import com.happy.Model.Hotel;
|
|
|
import com.happy.Model.House;
|
|
import com.happy.Model.House;
|
|
|
import com.happy.Model.weixin.Users;
|
|
import com.happy.Model.weixin.Users;
|
|
@@ -188,7 +189,8 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
|
|
|
hotel.setRoom_number_calc(mhd.get().getTotalHouseNum().toString());
|
|
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<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();
|
|
Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
|
|
|
if (one != null && one.isPresent() && min != null && min.isPresent()) {
|
|
if (one != null && one.isPresent() && min != null && min.isPresent()) {
|