取消预定和出车的bug

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -810,8 +810,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         DateTime endDay =DateTime.parse(bookVehicleVo.getUnbookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         uinbookDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
-        //原设计为 读取 bookVehicleVo.getNotCheckTimeLegal()， 现在取消/拒绝 默认false
-        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getUnbookStartDate(), bookVehicleVo.getUnbookEndDate(), Boolean.FALSE);
+        //原设计为 读取 bookVehicleVo.getNotCheckTimeLegal()， 现在取消/拒绝 true
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getUnbookStartDate(), bookVehicleVo.getUnbookEndDate(), Boolean.TRUE);
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_UNBOOK_TWO_MONTH);
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java

@@ -47,11 +47,10 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
             if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
                 throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
             }
-            if (bookStartDate.compareTo(bookEndDate) > 0) {
-                throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
-            }
         }
-
+        if (bookStartDate.compareTo(bookEndDate) > 0) {
+            throw new BaseException(ResultCode.END_TIME_FROM_TODAY);
+        }
         Map<String, Integer> predictableHours = Maps.newHashMap();
         //预定开始小时
         int hour = new DateTime(startDate).hourOfDay().get();