Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java

@@ -160,6 +160,9 @@ public class DeliverFinishReportListener implements ReportService {
 							entity.setWaybillNumber(qualityDeliverEntity.getWaybillNumber());
 							entity.setConditions(qualityDeliverEntity.getConditions());
 							entity.setSignNum(qualityDeliverEntity.getSignNum());
+							entity.setArriveProvince(qualityDeliverEntity.getArriveProvince());
+							entity.setArriveCity(qualityDeliverEntity.getArriveCity());
+							entity.setArriveDistrict(qualityDeliverEntity.getArriveDistrict());
 							// 查询品类
 							BasicdataFactoryCategoryEntity param = new BasicdataFactoryCategoryEntity();
 							param.setBrand(qualityDeliverEntity.getBrandName());
@@ -770,9 +773,11 @@ public class DeliverFinishReportListener implements ReportService {
 															Collection<QualityDeliverEntity> values = valueMap.values();
 															// 按省市区分组后的数量 arriveProvince arriveCity arriveDistrict
 															if(CollUtil.isNotEmpty(values)){
-																Set<String> collect1 = values.stream().map(v -> {
+																Set<String> collect1 = values.stream()
-																	return v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict();
+																	.filter(v -> StrUtil.isNotEmpty(v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict()))
-																}).collect(Collectors.toSet());
+																	.map(v -> {
+																		return v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict();
+																	}).collect(Collectors.toSet());
 																if(CollUtil.isNotEmpty(collect1)){
 																	dkp = collect1.size();
 																}