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

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

@@ -55,8 +55,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 			for(String date : getAllDate(vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate())) {
 				vehicleHolidayPriceInfo.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
 				VehicleHolidayPriceInfo oldValue = getByVehicleId(vehicleHolidayPriceInfo.getVehicleId(),  date);
-				if (oldValue == null) {
-					vehicleHolidayPriceInfo.setId(null);
+				if (oldValue == null && vehicleHolidayPriceInfo.getId() == null) {
 					insertSelectiveRe(vehicleHolidayPriceInfo);
 				} else {
 					BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
@@ -72,8 +71,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 					vehicleHolidayPriceInfo.setVehicleId(vehicleInfo.getId());
 					vehicleHolidayPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch());
 					vehicleHolidayPriceInfo.setModelId(vehicleInfo.getModelId());
-					vehicleHolidayPriceInfo.setId(null);
-					if (oldValue == null) {
+					if (oldValue == null && vehicleHolidayPriceInfo.getId() == null) {
 						insertSelectiveRe(vehicleHolidayPriceInfo);
 					} else {
 						BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));