fix

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -437,7 +437,7 @@ public class HotelController extends WebConfig {
         } else {
             busRoomBookingOrders.getOrderInfo().setCustomerType(1);
         }
-        busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders, isTeam);
+        busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders, isTeam,false);
 
         //创建业务消息信息
         LambdaQueryWrapper<SysUser> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();

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

@@ -99,7 +99,7 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	public Result<String> add(@RequestBody BookingOrderSaveDto busRoomBookingOrders) {
 		Boolean isTeam = busRoomBookingOrders.getOrderInfo().getBookingOrdersType().equals(2);
 		busRoomBookingOrders.getOrderInfo().setBookingOrdersType(1);
-		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam));
+		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam,false));
 	}
 	 /**
 	  *   添加批次订单

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

@@ -26,7 +26,7 @@ import java.util.Map;
  */
 public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrders> {
 
-    String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam);
+    String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving);
 
     BookingOrderEditVo getBookingInfoById(String orderId, String bookingNo);
 

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

@@ -104,7 +104,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam) {
+    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving) {
         isTeam = isTeam != null && isTeam;
         LoginUser user = TokenUtils.getAuthUser();
         item.getOrderInfo().setCreateTime(new Date());
@@ -183,7 +183,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         if(item.getOrderInfo().getBookingOrdersType().equals(BookingOrdersType.NORMAL.getKey())) {
             if(item.getOrderInfo().getArrivalTime() == null || item.getOrderInfo().getDueOutTime() == null)
                 throw new JeecgBootException("预抵时间和预离时间不能为空");
-            if(item.getOrderInfo().getArrivalTime().getTime() < new Date().getTime())
+            if(item.getOrderInfo().getArrivalTime().getTime() < new Date().getTime() && !isLiving)
                 throw new JeecgBootException("预抵时间不能小于当前时间");
             if(item.getOrderInfo().getArrivalTime().getTime() >= item.getOrderInfo().getDueOutTime().getTime())
                 throw new JeecgBootException("预抵时间不能大于或者等于预离时间");
@@ -977,7 +977,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam, String hotelId) {
-        String bookingOrderNo = bookingOrderSave(livingData,isTeam);
+        String bookingOrderNo = bookingOrderSave(livingData,isTeam,true);
         if(bookingOrderNo != null && !bookingOrderNo.isEmpty()){
             BookingOrderEditVo bookingOrderVo =  getBookingInfoById(null,bookingOrderNo);
             // 散客取roomIds