|
@@ -3,6 +3,7 @@ package com.happy.service.impl;
|
|
|
import com.happy.Model.Booking;
|
|
import com.happy.Model.Booking;
|
|
|
import com.happy.Model.Hotel;
|
|
import com.happy.Model.Hotel;
|
|
|
import com.happy.Model.House;
|
|
import com.happy.Model.House;
|
|
|
|
|
+import com.happy.Until.DateUtil;
|
|
|
import com.happy.Until.Func;
|
|
import com.happy.Until.Func;
|
|
|
import com.happy.Until.TimeExchange;
|
|
import com.happy.Until.TimeExchange;
|
|
|
import com.happy.dao.BookDao;
|
|
import com.happy.dao.BookDao;
|
|
@@ -15,7 +16,10 @@ import com.happy.service.HouseService;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
@Service("AppHomePageService")
|
|
@Service("AppHomePageService")
|
|
|
public class AppHomePageImplService implements AppHomePageService {
|
|
public class AppHomePageImplService implements AppHomePageService {
|
|
@@ -28,6 +32,8 @@ public class AppHomePageImplService implements AppHomePageService {
|
|
|
public HouseService houseService;
|
|
public HouseService houseService;
|
|
|
@Resource
|
|
@Resource
|
|
|
public HotelService hotelService;
|
|
public HotelService hotelService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ public BookService bookService;
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -50,23 +56,60 @@ public class AppHomePageImplService implements AppHomePageService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public Hotel getHotelAndHouseByHotelId(String hotelId) {
|
|
|
|
|
|
|
+ public Hotel getHotelAndHouseByHotelId(String hotelId, String queryStartTime, String queryEndTime) {
|
|
|
if (Func.checkNull(hotelId))
|
|
if (Func.checkNull(hotelId))
|
|
|
return new Hotel();
|
|
return new Hotel();
|
|
|
Hotel hotel = hotelService.getById(Func.parseInt(hotelId));
|
|
Hotel hotel = hotelService.getById(Func.parseInt(hotelId));
|
|
|
if (Func.checkNull(hotel.getManagerId()))
|
|
if (Func.checkNull(hotel.getManagerId()))
|
|
|
return hotel;
|
|
return hotel;
|
|
|
|
|
|
|
|
- hotel.getManagerId();// 需求确定使用商户id关联房型
|
|
|
|
|
|
|
+ System.out.println(hotel.getManagerId());// 需求确定使用商户id关联房型
|
|
|
StringBuffer strSql = new StringBuffer();
|
|
StringBuffer strSql = new StringBuffer();
|
|
|
strSql.append(" and manager_id = '").append(hotel.getManagerId()).append("' ");
|
|
strSql.append(" and manager_id = '").append(hotel.getManagerId()).append("' ");
|
|
|
- List houseList = houseService.queryList(strSql.toString());
|
|
|
|
|
|
|
+ List<House> houseList = houseService.queryList(strSql.toString());
|
|
|
|
|
+
|
|
|
|
|
+// Map<String, House> houseMap = new HashMap();
|
|
|
|
|
+// houseList.forEach((House house) ->{
|
|
|
|
|
+// if (house.getId() == 0)
|
|
|
|
|
+// return;
|
|
|
|
|
+// houseMap.put(Func.parseStr(house.getId()),house);
|
|
|
|
|
+// });
|
|
|
|
|
+
|
|
|
|
|
|
|
|
// 判断是否有房间,对每个房型进行标识
|
|
// 判断是否有房间,对每个房型进行标识
|
|
|
-// hotel.
|
|
|
|
|
|
|
+ StringBuffer strSqlBook = new StringBuffer();
|
|
|
|
|
+ strSqlBook.append(" and hotel_manager_id = '").append(hotel.getManagerId()).append("' ");
|
|
|
|
|
+ strSqlBook.append(" and order_start_time >= '").append(queryStartTime).append("' ");
|
|
|
|
|
+ strSqlBook.append(" and order_end_time < '").append(queryEndTime).append("' ");
|
|
|
|
|
+
|
|
|
|
|
+ List<Booking> bookList = bookService.queryList(strSqlBook.toString());
|
|
|
|
|
+
|
|
|
|
|
+ Map<String, Integer> houseBookingMap = new HashMap();
|
|
|
|
|
+ Integer numberTemp = new Integer(0);
|
|
|
|
|
+ for (Booking booking: bookList) {
|
|
|
|
|
+ if (Func.checkNull(booking.getHouseId()))
|
|
|
|
|
+ continue;
|
|
|
|
|
+
|
|
|
|
|
+ if (houseBookingMap.containsKey(booking.getHouseId()))
|
|
|
|
|
+ {
|
|
|
|
|
+ numberTemp = houseBookingMap.get(booking.getHouseId());
|
|
|
|
|
+ int i = Func.parseInt(numberTemp) + booking.getHouseOrderNumber();
|
|
|
|
|
+ houseBookingMap.put(booking.getHouseId(),i);
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+ houseBookingMap.put(booking.getHouseId(),booking.getHouseOrderNumber());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ houseList.forEach((House house) ->{
|
|
|
|
|
+ if (!houseBookingMap.containsKey(house.getId()))
|
|
|
|
|
+ return;
|
|
|
|
|
|
|
|
|
|
+ int i = Func.parseInt(house.getNumber()) - Func.parseInt(houseBookingMap.get(house.getId()));
|
|
|
|
|
+ house.setRemark(Func.parseStr(i));
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
|
|
|
|
|
- return null;
|
|
|
|
|
|
|
+ hotel.setHouseList(houseList);
|
|
|
|
|
+ return hotel;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|