Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -538,10 +538,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
 
     public boolean filterHourInfoBooked(String vehicleId, Map<String, Integer> hourInfo) {
+        if(MapUtils.isEmpty(hourInfo)) {
+            return false;
+        }
         for(Map.Entry<String, Integer> entry : hourInfo.entrySet()) {
-            VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-            vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
-            vehicleBookHourInfoDto.setVehicleId(vehicleId);
             if(entry.getValue() == 0) {//0点 查询是否有已经预约的记录
                 Map<String, Object> param = new HashMap<>();
                 param.put("vehicleId", vehicleId);
@@ -551,6 +551,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     return false;
                 }
             }
+            VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+            vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+            vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
                 if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) != 0) { // 已经被预定

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

@@ -78,18 +78,13 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
             }
         DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
         DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
-
+        if(startPredictableHour == 0) { //如果是0点就直接预订全天
+            startPredictableHour = 16777215;
+        }
         if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
             //如果开始时间是0点开始
-            if(startPredictableHour == 0 || endPredictableHour == 0) {
-                predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour | endPredictableHour);
-            } else {
                 predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
-            }
         } else { //非同一天开始
-            if(startPredictableHour == 0) { //如果是0点就直接预订全天
-                startPredictableHour = 16777215;
-            }
             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);
         }