|
|
@@ -4102,6 +4102,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
.map(InsPlyIncomeInvoiceSettlement::getActualReceivedAmount)
|
|
|
.filter(Objects::nonNull)
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ BigDecimal settlementPaymentDifference = insPlyIncomeInvoiceSettlements.stream()
|
|
|
+ .map(InsPlyIncomeInvoiceSettlement::getSettlementPaymentDifference)
|
|
|
+ .filter(Objects::nonNull)
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal receivableSupervisePremium = action.getReceivableSupervisePremium() != null ? action.getReceivableSupervisePremium(): BigDecimal.ZERO;
|
|
|
// BigDecimal overinflatedAmount = action.getOverinflatedAmount() != null? action.getOverinflatedAmount(): BigDecimal.ZERO;
|
|
|
// 待结算金额 = 开票金额 - 已收金额
|
|
|
@@ -4112,6 +4116,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
action.setRemainSettlementAmount(remainSettlementAmount);
|
|
|
action.setCompanyAllName(allCompanyHierarchyPaths.get(Objects.toString(action.getCompanyId(),"")));
|
|
|
action.setSettlementStatus(settlementStatusName);
|
|
|
+ // 回款差额
|
|
|
+ action.setSettlementPaymentDifference(settlementPaymentDifference);
|
|
|
+
|
|
|
if ("2".equals(invoiceRecordQueryVo.getInvoiceType())) {
|
|
|
LambdaQueryWrapper<InsFeeFollowOrder> insFeeFollowOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
insFeeFollowOrderLambdaQueryWrapper.eq(InsFeeFollowOrder::getYear, action.getYear());
|