利润结算表

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -210,7 +211,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
             Long contractId = profitSettlementVo.getContractId();
 
             // 到账认领
-            List<ClaimContract> itemClaimContractList = contractIdClaimContractListMap.get(contractId);
+            List<ClaimContract> itemClaimContractList = contractIdClaimContractListMap.getOrDefault(contractId, new ArrayList<>());
 
             // 汇率币种map
             Map<String, BigDecimal> map = detailsRateMap.get(contractId);
@@ -268,12 +269,12 @@ public class SaleStatementServiceImpl implements SaleStatementService {
             Long contractId = profitSettlementVo.getContractId();
 
             // 申购单
-            List<PurchaseDetail> itemPurchaseDetailList = contractIdPurchaseDetailListMap.get(contractId);
+            List<PurchaseDetail> itemPurchaseDetailList = contractIdPurchaseDetailListMap.getOrDefault(contractId, new ArrayList<>());
 
             // 汇率币种map
-            Map<String, BigDecimal> map = detailsRateMap.get(contractId);
+            Map<String, BigDecimal> map = detailsRateMap.getOrDefault(contractId, new HashMap<>());
 
-            BigDecimal payForGoods = itemPurchaseDetailList.stream().map(purchaseDetail -> {
+            BigDecimal purchaseAmount = itemPurchaseDetailList.stream().map(purchaseDetail -> {
 
                 // 根据申购单id获取币种
                 String currency = purchaseIdCurrencyMap.get(purchaseDetail.getPurchaseId());
@@ -289,7 +290,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
 
             }).reduce(BigDecimal.ZERO, BigDecimal::add);
 
-            profitSettlementVo.setPayForGoods(payForGoods);
+            profitSettlementVo.setPurchaseAmount(purchaseAmount);
 
         }