From 29a0b2f6cf701f267273beb62727eb8211d5644d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Mar 2024 10:57:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=2082977=20=E5=88=B0=E8=B4=A6=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8--=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E7=BB=B4=E6=8A=A4--=E5=BD=93=E7=A1=AE=E6=94=B6?=
 =?UTF-8?q?=E7=AD=89=E4=BA=8E=E5=BE=85=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=97=B6--=E9=A2=84=E4=BC=B0=E5=88=B0=E8=B4=A6=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=B2=A1=E6=9C=89=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/service/impl/PayConfirmPaymentRecordService.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
index 4d0c5269..832f76e5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
@@ -310,6 +310,10 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
                 tbMember.setConfirmNoTaxAmount(noTaxAmount);
                 affirmIncome = getAffirmIncome(tbMember.getAmountReceivable(), confirmAmount);
                 tbMember.setAffirmIncome(affirmIncome);
+                //如果确收收入的金额=待确收金额时，当前填入的确收日期 覆盖 预计到账日期字段
+                if (Integer.valueOf(1).equals(affirmIncome)){
+                    tbMember.setEstimatedArrivalDate(paymentDate);
+                }
                 tbMemberProjectSubitemMapper.updateById(tbMember);
                 break;
             //标协证书