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

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

@@ -67,16 +67,20 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap
 			}
 		}  else {
 			vehicleList.parallelStream().forEach(vehicleInfo -> {
-				VehicleCommonPriceInfo oldValue = getByVehicleId(vehicleInfo.getId());
-				vehicleCommonPriceInfo.setVehicleId(vehicleInfo.getId());
-				vehicleCommonPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch());
-				vehicleCommonPriceInfo.setModelId(vehicleInfo.getModelId());
-				if (oldValue == null && vehicleCommonPriceInfo.getId() == null) {
-					insertSelectiveRe(vehicleCommonPriceInfo);
-				} else {
-					BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-					updateSelectiveByIdRe(oldValue);
+				if (vehicleInfo != null) {
+					VehicleCommonPriceInfo oldValue = getByVehicleId(vehicleInfo.getId());
+					vehicleCommonPriceInfo.setVehicleId(vehicleInfo.getId());
+					vehicleCommonPriceInfo.setCompanyId(vehicleInfo.getSubordinateBranch());
+					vehicleCommonPriceInfo.setModelId(vehicleInfo.getModelId());
+					vehicleCommonPriceInfo.setId(null);
+					if (oldValue == null) {
+						insertSelectiveRe(vehicleCommonPriceInfo);
+					} else {
+						BeanUtil.copyProperties(vehicleCommonPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+						updateSelectiveByIdRe(oldValue);
+					}
 				}
+
 			});
 		}
 		return ObjectRestResponse.succ();

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

@@ -65,19 +65,22 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 
 		}  else {
 			vehicleList.parallelStream().forEach(vehicleInfo -> {
-				for(String date : getAllDate(vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate())) {
-					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());
-					if (oldValue == null && vehicleHolidayPriceInfo.getId() == null) {
-						insertSelectiveRe(vehicleHolidayPriceInfo);
-					} else {
-						BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-						updateSelectiveByIdRe(oldValue);
+				if (vehicleInfo != null) {
+					for(String date : getAllDate(vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate())) {
+						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());
+						if (oldValue == null && vehicleHolidayPriceInfo.getId() == null) {
+							insertSelectiveRe(vehicleHolidayPriceInfo);
+						} else {
+							BeanUtil.copyProperties(vehicleHolidayPriceInfo, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+							updateSelectiveByIdRe(oldValue);
+						}
 					}
 				}
+
 			});
 		}
 		return ObjectRestResponse.succ();