Răsfoiți Sursa

修改bug:
bug表870,私有应收,手续费开票后结算填写的回款差额原因,确定后不显示
bug表869,私有应收,手续费开票时填写的开票时间与开票记录中开票时间不一致

jiakai 2 luni în urmă
părinte
comite
fdb3540492

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

@@ -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)){

+ 1 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

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