Merge remote-tracking branch 'origin/dev' into dev

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

@@ -165,6 +165,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	private final DistributionParcelListMapper distributionParcelListMapper;
 
+	private final DistributionDeliveryChargeMapper distributionDeliveryChargeMapper;
+
 //	private final IWarehouseRetentionScanClient warehouseRetentionScanClient;
 
 //	@Lazy
@@ -4642,10 +4644,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			Map<String,Object> fua = new HashMap<>();
 
 			// 需要去查询费用明细
+			LambdaQueryWrapper<DistributionDeliveryChargeEntity> qu = new LambdaQueryWrapper<>();
+			qu.eq(DistributionDeliveryChargeEntity::getBillLading,distrilbutionBillLadingEntity.getId());
+			List<DistributionDeliveryChargeEntity> distributionDeliveryChargeEntities = distributionDeliveryChargeMapper.selectList(qu);
+
+			HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+
+			BigDecimal sumMoney =new BigDecimal("0.00");
+			// 构建费用明细
+			for (DistributionDeliveryChargeEntity distributionDeliveryChargeEntity : distributionDeliveryChargeEntities) {
+
+				String costName = distributionDeliveryChargeEntity.getCost();// 查询码表 得到类型
+
+				costName=DictBizCache.getValue("delivery_cost",costName);
+				BigDecimal costMoney = distributionDeliveryChargeEntity.getMoney();// 查询码表 得到类型
+				objectObjectHashMap.put(costName,costMoney);
+				sumMoney.add(costMoney);
+
+			}
 
-			fua.put("费用明细",0);
+			fua.put("费用明细",objectObjectHashMap);
 
-			fua.put("费用合计",0);
+			fua.put("费用合计",sumMoney);
 
 			map.put("费用统计",fua);