feat(all): 服务商成本维护

1 增加批量新增司机

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

@@ -283,7 +283,7 @@ public class DeliverFinishReportListener implements ReportService {
 																// 装卸费单价
 																String loadingUnloadingFee = expenseDispatchPriceCategoryVO.getLoadingUnloadingFee();
 																// 上楼层数
-																// 查询出上楼层数
+																//
 																Integer stairsNumber = 0;
 																if (addvaluePackageMap.containsKey(entity.getOrderPackageCode())) {
 																	stairsNumber = Convert.toInt(addvaluePackageMap.get(entity.getOrderPackageCode()));

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java

@@ -28,6 +28,7 @@ import com.logpm.distribution.service.IDistributionAddvalueDetailService;
 import com.logpm.distribution.service.IDistributionAddvaluePackageService;
 import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -72,7 +73,13 @@ public class DistributionAddvaluePackageServiceImpl extends BaseServiceImpl<Dist
 			.in(DistributionAddvaluePackageEntity::getOrderPackageCode, collect1));
 		if (CollUtil.isNotEmpty(list)) {
 			// 转map
-			Map<Long, String> map = list.stream().collect(Collectors.toMap(DistributionAddvaluePackageEntity::getAddvalueDetailId, DistributionAddvaluePackageEntity::getOrderPackageCode));
+			Map<Long, String> map = list.stream()
+				.filter(it -> ObjectUtil.isNotEmpty(it.getAddvalueDetailId()))
+				.collect(Collectors.toMap(
+					DistributionAddvaluePackageEntity::getAddvalueDetailId,
+					DistributionAddvaluePackageEntity::getOrderPackageCode,
+					(existingValue, newValue) -> existingValue // 处理键冲突
+				));
 			List<DistributionAddvalueDetailEntity> list1 = addvalueDetailService.list(
 				Wrappers.<DistributionAddvalueDetailEntity>lambdaQuery()
 					.select(DistributionAddvalueDetailEntity::getFloolNum, DistributionAddvalueDetailEntity::getId)