缺失功能：

修改ins_ply_income_invoice_settlement的payment_difference和payment_reason

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncomeInvoiceSettlement.java

@@ -30,10 +30,10 @@ public class InsPlyIncomeInvoiceSettlement extends BaseModel {
     private Date receivePaymentDate;
 
     @Schema(description = "回款差额")
-    private BigDecimal paymentDifference;
+    private BigDecimal settlementPaymentDifference;
 
     @Schema(description = "回款原因")
-    private String paymentReason;
+    private String settlementPaymentReason;
 
 
     @TableField(exist = false)
@@ -49,8 +49,8 @@ public class InsPlyIncomeInvoiceSettlement extends BaseModel {
         this.invoiceId = invoiceId;
         this.actualReceivedAmount = actualReceivedAmount;
         this.receivePaymentDate = receivePaymentDate;
-        this.paymentDifference = paymentDifference;
-        this.paymentReason = paymentReason;
+        this.settlementPaymentDifference = paymentDifference;
+        this.settlementPaymentReason = paymentReason;
     }
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoiceRecordResult.java

@@ -55,6 +55,11 @@ public class InvoiceRecordResult extends PageRequest {
      */
     private String paymentReason;
 
+    /**
+     * 结算时的差额原因
+     */
+    private String settlementPaymentReason;
+
     /**
      * 应收项(转义)
      * 保留这个是为了兼容之前的功能

commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementVo.java

@@ -24,10 +24,10 @@ public class SettlementVo {
     private String receivePaymentDate;
 
     @Schema(description = "回款差额")
-    private BigDecimal paymentDifference;
+    private BigDecimal settlementPaymentDifference;
 
     @Schema(description = "回款原因")
-    private String paymentReason;
+    private String settlementPaymentReason;
 
     @Schema(description = "附加id")
     private List<String> attachmentIds;

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

@@ -1064,7 +1064,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             // 处理结算数据
             // 未完全结算完成
             InsPlyIncomeInvoiceSettlement settlement = new InsPlyIncomeInvoiceSettlement(invoice.getId(), settlementVo.getActualReceivedAmount(),
-                    DateTime.now(), settlementVo.getPaymentDifference(), settlementVo.getPaymentReason());
+                    DateTime.now(), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
             insPlyIncomeInvoiceSettlementMapper.insert(settlement);
 
             if (CollectionUtils.isNotEmpty(settlementVo.getAttachmentIds())) {
@@ -1081,7 +1081,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             }
 
             // 判断是否已经结算完成, 考虑回款差额
-            if (surplusPremium.compareTo(settlementVo.getActualReceivedAmount().add(platformSettlementVo.getSettlementVo().getPaymentDifference())) == 0) {
+            if (surplusPremium.compareTo(settlementVo.getActualReceivedAmount().add(platformSettlementVo.getSettlementVo().getSettlementPaymentDifference())) == 0) {
                 log.info("序号为[{}]的发票已经结算完成",invoice.getId());
                 // 更新发票状态
                 invoice.setStatus("1");
@@ -1499,7 +1499,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             // 处理结算数据
             // 未完全结算完成
             InsPlyIncomeInvoiceSettlement settlement = new InsPlyIncomeInvoiceSettlement(settlementVo.getInvoicingId(), settlementVo.getActualReceivedAmount(),
-                    DateTime.now(), settlementVo.getPaymentDifference(), settlementVo.getPaymentReason());
+                    DateTime.now(), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
             insPlyIncomeInvoiceSettlementMapper.insert(settlement);
 
             if (CollectionUtils.isNotEmpty(settlementVo.getAttachmentIds())) {
@@ -2474,7 +2474,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             // 处理结算数据
             // 未完全结算完成
             InsPlyIncomeInvoiceSettlement settlement = new InsPlyIncomeInvoiceSettlement(settlementVo.getInvoicingId(), settlementVo.getActualReceivedAmount(),
-                    DateTime.now(), settlementVo.getPaymentDifference(), settlementVo.getPaymentReason());
+                    DateTime.now(), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
             insPlyIncomeInvoiceSettlementMapper.insert(settlement);
 
             if (CollectionUtils.isNotEmpty(settlementVo.getAttachmentIds())) {

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

@@ -1195,7 +1195,8 @@
             eic.name_simple as companyNameSimple,
             sum( ipiis.actual_received_amount ) AS actual_received_amount,
             ipii.status,
-            ipii.payment_reason
+            ipii.payment_reason,
+            ipiis.settlementPaymentReason
         FROM
             ins_ply_income_invoice ipii
                 LEFT JOIN ins_ply_income_invoice_settlement ipiis ON ipii.id = ipiis.invoice_id