修改车辆节假日价格信息

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

@@ -66,6 +66,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 		if (vehicle == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "车辆不存在！");
 		}
+		Integer festivalId = getMaxFestivalId() + 1;
 		vehicleHolidayPriceInfo.setCompanyId(vehicle.getSubordinateBranch());
 		List<Vehicle> vehicleList = null;
 		if (vehicleHolidayPriceInfo.getAllVehicleUse() != null && vehicleHolidayPriceInfo.getAllVehicleUse() == 1) {//所有车辆可用
@@ -80,7 +81,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 				VehicleHolidayPriceInfo oldValue = getByVehicleId(vehicleHolidayPriceInfo.getVehicleId(),  date);
 				if (oldValue == null) {
 					vehicleHolidayPriceInfo.setId(null);
-					vehicleHolidayPriceInfo.setFestivalId(getMaxFestivalId() + 1);
+					vehicleHolidayPriceInfo.setFestivalId(festivalId);
 					insertSelectiveRe(vehicleHolidayPriceInfo);
 				} else {
 					BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
@@ -100,7 +101,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 							oldValue.setCompanyId(vehicleInfo.getSubordinateBranch());
 							oldValue.setModelId(vehicleInfo.getModelId());
 							oldValue.setId(null);
-							oldValue.setFestivalId(getMaxFestivalId() + 1);
+							oldValue.setFestivalId(festivalId);
 							insertSelectiveRe(vehicleHolidayPriceInfo);
 						} else {
 							BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));