Merge branch 'master-vehicle-price' into dev-tiande

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

@@ -91,15 +91,20 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 				if (vehicleInfo != null) {
 					for(String date : getAllDate(vehicleHolidayPriceInfo.getStartTime(), vehicleHolidayPriceInfo.getEndTime())) {
 						VehicleHolidayPriceInfo oldValue = getByVehicleId(vehicleInfo.getId(),  date);
-						vehicleHolidayPriceInfo.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
-						vehicleHolidayPriceInfo.setVehicleId(vehicleInfo.getId());
-						vehicleHolidayPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch());
-						vehicleHolidayPriceInfo.setModelId(vehicleInfo.getModelId());
-						vehicleHolidayPriceInfo.setId(null);
 						if (oldValue == null ) {
+							oldValue = new VehicleHolidayPriceInfo();
+							oldValue.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
+							oldValue.setVehicleId(vehicleInfo.getId());
+							oldValue.setCompanyId(vehicleInfo.getSubordinateBranch());
+							oldValue.setModelId(vehicleInfo.getModelId());
+							oldValue.setId(null);
 							insertSelectiveRe(vehicleHolidayPriceInfo);
 						} else {
 							BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+							oldValue.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
+							oldValue.setVehicleId(vehicleInfo.getId());
+							oldValue.setCompanyId(vehicleInfo.getSubordinateBranch());
+							oldValue.setModelId(vehicleInfo.getModelId());
 							updateSelectiveByIdRe(oldValue);
 						}
 					}