Merge branch 'master-bug' into 'master'

Master-bug-master-merge

See merge request !12

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

@@ -531,7 +531,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
             //当天已经被预定检查小时是否也被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
-        } else if ((vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
+        } else if (vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null && (vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
         }
         return Boolean.TRUE;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -70,6 +70,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     private VehicleJobHandler vehicleJobHandler;
 
+    @Autowired
+    private VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+
     @Autowired
     BranchCompanyBiz branchCompanyBiz;
     public UserFeign getUserFeign() {
@@ -506,4 +509,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public ObjectRestResponse checkHourInfo() {
         return vehicleBookRecordBiz.checkDateInvalide();
     }
+
+    @GetMapping("/app/unauth/checkBookHourInfo")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse checkBookHourInfo() {
+        return vehicleBookHourInfoBiz.checkBookHourInfo();
+    }
 }