소스 검색

1.海运保存报错问题修改

纪新园 8 달 전
부모
커밋
a0c2e498ed
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

+ 2 - 2
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -535,7 +535,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				feeCenterListAll.add(item);
 			}
 			oceanFreightCr = bills.getFeeCenterListC().stream().filter(e -> "C".equals(e.getDc()) &&
-				"HYF".equals(e.getFeeCode())).map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+				"HYF".equals(e.getFeeCode())).map(FeeCenter::getAmountLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 		}
 		//应收
 		int statusD = 0;
@@ -607,7 +607,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				feeCenterListAll.add(item);
 			}
 			oceanFreightDr = bills.getFeeCenterListD().stream().filter(e -> "D".equals(e.getDc()) &&
-				"HYF".equals(e.getFeeCode())).map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+				"HYF".equals(e.getFeeCode())).map(FeeCenter::getAmountLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 		}
 		if (!feeCenterListAll.isEmpty()) {
 			feeCenterService.submitListOptimization(feeCenterListAll);