取消预定和出车的bug

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

@@ -851,6 +851,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
     public boolean unbookHourInfo(String vehicleId, Map<String, Integer> hourInfo,  Map<String,Object> params) {
+        boolean flag = false;
         for (Map.Entry<String, Integer> entry : hourInfo.entrySet()) {
             VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
             vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
@@ -858,11 +859,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
                if((vehicleBookHourInfos.get(0).getBookedHour() | 0) == 0) {
-                   Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
-                   if (effected < 1) {
-                       return Boolean.FALSE;
-                   } else {
-                       continue;
+                   if(!flag) {
+                       Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
+                       if (effected < 1) {
+                           return Boolean.FALSE;
+                       } else {
+                           flag = true;
+                           continue;
+                       }
                    }
                } else {
                    vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));

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

@@ -46,7 +46,6 @@ public class VehicleActiveController {
     @PostMapping("small/departure")
     @IgnoreUserToken
     public RestResponse departureBySmall(@RequestBody VehicleDepartureVo departureVo) {
-
         if (departureVo == null || departureVo.getVehicleId() == null
                 || departureVo.getMileage() == null || departureVo.getDepartureBranchCompanyId() == null
                 || departureVo.getExpectArrivalBranchCompanyId() == null) {