|
|
|
@ -550,13 +550,17 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
List<StatisticsDistributionPackageEntity> distributionPackageEntities1 = distributionPackageService.list(Wrappers.<StatisticsDistributionPackageEntity>lambdaQuery() |
|
|
|
|
.in(StatisticsDistributionPackageEntity::getTrainNumber, trainNumberSet)); |
|
|
|
|
for (String s : trainNumberSet) { |
|
|
|
|
if(CollUtil.isNotEmpty(distributionPackageEntities1)){ |
|
|
|
|
List<StatisticsDistributionPackageEntity> 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<String, List<StatisticsDistributionPackageEntity>> map = distributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getTrainNumber));
|
|
|
|
|
// if (CollUtil.isNotEmpty(map)) {
|
|
|
|
|
// for (Map.Entry<String, List<StatisticsDistributionPackageEntity>> entry : map.entrySet()) {
|
|
|
|
|