诺晶 bug 配件账单金额修改

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -1562,10 +1562,12 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					.eq(DeliveryFees::getPid, delivery.getId())
 					.eq(DeliveryFees::getIsDeleted, 0);
 				List<DeliveryFees> deliveryFeesList = deliveryFeesService.list(deliveryFeesLambdaQueryWrapper);
-				BigDecimal amount = deliveryFeesList.stream().filter(e -> e.getItemId().equals(r.getData().getId()) && ObjectUtils.isNotNull(e.getAmount())).map(DeliveryFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal amount = deliveryFeesList.stream().map(DeliveryFees::getAmount).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+				purchaseTotalAmount = purchaseTotalAmount.add(amount);
+				/*BigDecimal amount = deliveryFeesList.stream().filter(e -> e.getItemId().equals(r.getData().getId()) && ObjectUtils.isNotNull(e.getAmount())).map(DeliveryFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 				purchaseTotalAmount = purchaseTotalAmount.add(amount);
 				BigDecimal amount1 = deliveryFeesList.stream().filter(e -> !e.getItemId().equals(r.getData().getId()) && ObjectUtils.isNotNull(e.getAmount())).map(DeliveryFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				purchaseTotalAmount = purchaseTotalAmount.subtract(amount1);
+				purchaseTotalAmount = purchaseTotalAmount.subtract(amount1);*/
 			}
 		}
 		deliveryAmount = purchaseTotalAmount;