|
|
@@ -1708,7 +1708,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
invoice.setOverinflatedAmount(invoicingVo.getOverinflatedAmount());
|
|
|
invoice.setReceivableSupervisePremium(invoicingVo.getReceivableSupervisePremium());
|
|
|
invoice.setTaxPoint(invoicingVo.getTaxPoint());
|
|
|
- invoice.setInvoiceTime(LocalDateTime.now());
|
|
|
+ invoice.setInvoiceTime(invoicingVo.getInvoiceTime());
|
|
|
insPlyIncomeInvoiceMapper.insert(invoice);
|
|
|
List<InsPlyIncomeInvoiceLink> invoicingLinkList = new ArrayList<>();
|
|
|
invoicingVo.getIncomeIds().forEach(incomeId -> {
|
|
|
@@ -6400,7 +6400,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
InsPlyIncomeInvoice insPlyIncomeInvoice = insPlyIncomeInvoiceMapper.selectById(invoiceId);
|
|
|
|
|
|
// 标记结算完成的时候,将未结算金额汇总 到最后一次结算的回款差额里面 lipf 2026年7月7日10:53:47
|
|
|
- BigDecimal settlementAmount = insPlyIncomeInvoiceSettlements.stream().map(action-> BigDecimalUtil.add(action.getSettlementPaymentDifference(), action.getActualReceivedAmount()))
|
|
|
+ BigDecimal settlementAmount = insPlyIncomeInvoiceSettlements.stream().map(InsPlyIncomeInvoiceSettlement::getActualReceivedAmount)
|
|
|
.reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
|
BigDecimal subtract = BigDecimalUtil.subtract(settlementAmount, insPlyIncomeInvoice.getReceivableSupervisePremium());
|
|
|
if (CollUtil.isNotEmpty(insPlyIncomeInvoiceSettlements)){
|