diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java index b0c58ac4c..ede9c12ed 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java @@ -550,12 +550,16 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl distributionPackageEntities1 = distributionPackageService.list(Wrappers.lambdaQuery() .in(StatisticsDistributionPackageEntity::getTrainNumber, trainNumberSet)); for (String s : trainNumberSet) { - List packageEntities = distributionPackageEntities1.stream() - .filter(entity -> ObjectUtil.equals(s, entity.getTrainNumber())) - .filter(entity -> ObjectUtil.equals(entity.getBrandId(), brandId)) - .filter(entity -> ObjectUtil.equals(entity.getConsigneeId(), consigneeId)) - .collect(Collectors.toList()); - buildDispatchCostToPackage(dispatchMinCostType, packageEntities, minCost, additionalCost); + if(CollUtil.isNotEmpty(distributionPackageEntities1)){ + List packageEntities = distributionPackageEntities1.stream() + .filter(entity -> ObjectUtil.equals(s, entity.getTrainNumber())) + .filter(entity -> ObjectUtil.equals(entity.getBrandId(), brandId)) + .filter(entity -> ObjectUtil.equals(entity.getConsigneeId(), consigneeId)) + .collect(Collectors.toList()); + if(CollUtil.isNotEmpty(packageEntities)){ + buildDispatchCostToPackage(dispatchMinCostType, packageEntities, minCost, additionalCost); + } + } } // Map> map = distributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getTrainNumber)); // if (CollUtil.isNotEmpty(map)) {