预订时间处理bug

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

@@ -464,11 +464,24 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
                bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
                unbookVehicle(bookVehicleVo);
+
+               map  = vehicleBookHourInfoBiz.getPredictableHours(startDay.toString(DATE_TIME_FORMATTER), endDay.toString(DATE_TIME_FORMATTER), bookVehicleVo.getNotCheckTimeLegal());
+               for(Map.Entry<String,List<String>> entry : yearMonthAndDate.entrySet()) {
+                   Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
+                   if(Boolean.FALSE.equals(rsEach)){
+                       throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
+                   }
+               }
                vehicleBookRecord.setBookStartDate(startDay.toDate());
                vehicleBookRecord.setBookEndDate(endDay.toDate());
                vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
            }
         }
+        //添加预定日期记录
+        Boolean hasSuc = bookedVehicle(bookVehicleVo);
+        if(!hasSuc){
+            throw new BaseException(ResultCode.BOOKED_FAILED_CODE);
+        }
 
 //        //添加预定时间记录
         for(Map.Entry<String, Integer> entry : map.entrySet()) {
@@ -478,18 +491,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setBookedHour(entry.getValue());
             vehicleBookHourInfoBiz.save(vehicleBookHourInfoDto);
         }
-        map  = vehicleBookHourInfoBiz.getPredictableHours(startDay.toString(DATE_TIME_FORMATTER), endDay.toString(DATE_TIME_FORMATTER), bookVehicleVo.getNotCheckTimeLegal());
-        for(Map.Entry<String,List<String>> entry : yearMonthAndDate.entrySet()) {
-            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
-            if(Boolean.FALSE.equals(rsEach)){
-                throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
-            }
-        }
-        //修改相关车辆预定记录
-        Boolean hasSuc = bookedVehicle(bookVehicleVo);
-        if(!hasSuc){
-            throw new BaseException(ResultCode.BOOKED_FAILED_CODE);
-        }
+
         //添加随车物品
         List<Map<String,Object>> params = Lists.newArrayList();
         if(MapUtils.isNotEmpty(bookVehicleVo.getSelectedAccItem())){
@@ -927,10 +929,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
-                   if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
+                   if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) { //时间取与运算为0说明当天全部取消预定
                        DateTime dateTime = DateTime.parse(entry.getKey(), DEFAULT_DATE_TIME_FORMATTER);
                        Integer andOperationFactor = 0;
-                       andOperationFactor |= 1<< ( dateTime.dayOfMonth().get());
+                       andOperationFactor |= 1 << ( dateTime.dayOfMonth().get() - 1);
                        VehicleBookInfo vehicleBookInfo = getByVehicleIdAndYearMonth(vehicleId, dateTime.toString(YEARMONTH_DATE_TIME_FORMATTER));
                        if(vehicleBookInfo != null) {
                           vehicleBookInfo.setBookedDate(vehicleBookInfo.getBookedDate() & ~andOperationFactor);

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

@@ -88,7 +88,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
             predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
         }
-        if(endDay.getDayOfMonth() - startDay.getDayOfMonth() > 1){ //
+        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
                 //全天预定