Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -792,7 +792,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             incomeDtoList = incomeDtoList.stream()
                     .filter(income -> StrUtil.isBlank(invoiceType)
                             || invoiceType.equals(income.getInvoiceType()))
-                    .toList();
+                    .collect(Collectors.toCollection(ArrayList::new));
             List<InsPlyIncomeDto> copyList = CollUtil.newArrayList();
             if (CollUtil.isNotEmpty(incomeDtoList)){
                 // 如果有发票类型为4的，则复制一条4的数据，完全一致，但发票类型为2
@@ -1711,7 +1711,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 -> {
@@ -6403,7 +6403,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)){

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1487,6 +1487,7 @@
         ipii.id,
         ipii.company_id,
         ipii.invoice_no,
+        ipii.invoice_time,
         ipii.invoice_type,
         ipii.invoice_risk_type,
         CASE