Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -252,8 +252,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         IPage<SettlementOwnerDetail> page = settlementOwnerDetailDao.pageInvoiceOwnerSettlementOrderDetailList(param);
         CountOwnerSettlementOwnerDetailVO vo = new CountOwnerSettlementOwnerDetailVO();
         vo.setOrderChildSum(page.getTotal());
-        vo.setLoadNetSum(page.getRecords().stream().map(SettlementOwnerDetail::getLoadNet).reduce(BigDecimal.ZERO,BigDecimal::add));
-        vo.setInvoiceFreightSum(page.getRecords().stream().map(SettlementOwnerDetail::getInvoiceFreight).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setLoadNetSum(page.getRecords().stream().map(SettlementOwnerDetail::getLoadNet).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setInvoiceFreightSum(page.getRecords().stream().map(SettlementOwnerDetail::getInvoiceFreight).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
         return vo;
     }
 
@@ -706,7 +706,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         vo.setVerifyResult(verifyResult);
         vo.setErrorFileUrl(uploadResult==null?null:uploadResult.getData());
         vo.setOrderChildSum(invoiceDataList.size());
-        vo.setLoadWeightSum(invoiceDataList.stream().map(InvoiceData::getLoadNet).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setLoadWeightSum(invoiceDataList.stream().map(InvoiceData::getLoadNet).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
         vo.setInvoiceFreightSum(invoiceDataList.stream().map(InvoiceData::getInvoiceFreight).reduce(BigDecimal.ZERO,BigDecimal::add));
         vo.setChildNoList(invoiceDataList.stream().map(InvoiceData::getChildNo).collect(Collectors.toList()));
         return vo;