修改还车未取消预定数据bug

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

@@ -892,32 +892,25 @@ 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());
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
-               if(vehicleBookHourInfos.get(0).getBookedHour() == entry.getValue()) {
-                   if(!flag) {
+                   vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
+                   if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
                        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()));
                    int effect = vehicleBookHourInfoBiz.updateByIdRe(vehicleBookHourInfos.get(0));
                    if (effect < 1) {
                        return Boolean.FALSE;
                    } else {
                        continue;
                    }
-               }
             } else {
                 return Boolean.FALSE;
             }