From 495582480164b2d78cdfc76119faa8b587b565cb Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 2 Aug 2024 15:22:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=E9=85=8D=E9=80=81=E7=BB=99=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StatisticsOrderInfoServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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)) {