搞你妈啊，傻逼酒店的客户，狗东西！@

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.business.controller;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
@@ -455,6 +456,7 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	 @RequestMapping(value = "/update-orders",method = RequestMethod.POST)
 	 public Result<Boolean> updateOrderInfo(Integer type,@RequestBody UpdateOrderInfoDto info) {
 	 	return Result.OK(service.updateOrderInfo(type,info));
+
 	 }
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomBookingOrders.java

@@ -36,9 +36,9 @@ public class BusRoomBookingOrders implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "预定订单主键")
     private String id;
-	/**预定类型：1，全天；2时租*/
-	@Excel(name = "预定类型：1，全天；2时租", width = 15)
-    @ApiModelProperty(value = "预定类型：1，全天；2时租")
+	/**预定类型：1，全天；2时租;3自用；4免费；5长租；*/
+	@Excel(name = "预定类型：1，全天；2时租;3自用；4免费；5长租；", width = 15)
+    @ApiModelProperty(value = "预定类型：1，全天；2时租;3自用；4免费；5长租；")
     private Integer bookingType;
 	/**预计抵达时间*/
 	@Excel(name = "预计抵达时间", width = 15, format = "yyyy-MM-dd HH:mm")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -227,6 +227,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                 throw new JeecgBootException("请选择预定房间");
             if(hotelId == null || hotelId.isEmpty()) throw  new JeecgBootException("参数错误，酒店id");
             item.getOrderInfo().setHotelId(hotelId);
+            // 保存order
             save(item.getOrderInfo());
             String bookingId = item.getOrderInfo().getId();
             // todo 判定是否有安排冲突的房间

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/xml/CesRoomsMapper.xml

@@ -25,7 +25,23 @@
                 ( o.arrival_time <= #{startOf} AND o.due_out_time >= #{startOf} ) -- 预抵时间在别的客人预定时间范围内
 		OR ( o.arrival_time <= #{endOf} AND o.due_out_time >= #{endOf} ) -- 或者预离时间在别的客户预定范围内
 
-	) UNION ALL
+	)
+        UNION ALL
+        SELECT DISTINCT
+            br.room_id
+        FROM
+            bus_booking_rooms br
+        inner join bus_rooms_living_order lo on lo.booking_room_id = br.id
+        WHERE
+            br.booking_type = 1
+        AND br.room_id IS NOT NULL
+        AND (lo.settle_type = -1)
+        and (
+            ( lo.arrival_time <= #{startOf} AND lo.due_out_time >= #{startOf} ) -- 预抵时间在别的客人预定时间范围内
+        OR ( lo.arrival_time <= #{endOf} AND lo.due_out_time >= #{endOf} ) -- 或者预离时间在别的客户预定范围内
+        )
+
+	UNION ALL
         SELECT
             br.room_id
         FROM