From c86eb4d4f6dee76cbddd527c6eb73eb8f8d83b7b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Jul 2024 09:37:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087645=2087647=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D=E5=90=8E=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=8A=B6=E6=80=81=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IPayPaymentCheckService.java      |  3 +-
 .../impl/PayPaymentCheckServiceImpl.java      | 53 ++++++++++++-------
 .../impl/PayPaymentRecordServiceImpl.java     | 45 ++++++++++------
 .../impl/PayCommonProjectServiceImpl.java     |  2 +-
 .../PayWorkingGroupSubItemServiceImpl.java    |  6 +--
 5 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
index 17889bd2..6e11d349 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
@@ -51,7 +51,8 @@ public interface IPayPaymentCheckService extends IService<PayPaymentRecordSub> {
      * @param amountReceivable  应收
      * @param paidAmount    实收
      * @param paymentStatus 缴费状态
+     * @param changeReceivableAmountFlag
      * @return
      */
-    String getPaymentStatus(BigDecimal amountReceivable,BigDecimal paidAmount,String paymentStatus);
+    String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
index 73032929..b0d39608 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
@@ -16,7 +16,6 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
@@ -531,7 +530,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     payPaymentRecords.add(payPaymentRecord);
                     payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
                 }else{
-                    paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
                     payCommonProject.setPaymentStatus(paymentStatus);
                     //更新主列表
                     payCommonProjectMapper.updateById(payCommonProject);
@@ -555,7 +554,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     payPaymentRecords.add(payPaymentRecord);
                     payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
                 }else{
-                    paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
                     payWorking.setPaymentStatus(paymentStatus);
                     //更新主列表
                     payWorkingGroupSubItemMapper.updateById(payWorking);
@@ -582,7 +581,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     payPaymentRecords.add(payPaymentRecord);
                     payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
                 }else{
-                    paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
                     member.setPaymentStatus(paymentStatus);
                     //更新主列表
                     payMemberProjectSubitemMapper.updateById(member);
@@ -621,7 +620,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     }
                     payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
-                    paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
                     tbMember.setPaymentStatus(paymentStatus);
                     tbCheckVo.setCheckResult(PayProjectCommon.NO);
 
@@ -670,7 +669,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     inAccount = payPaymentRecordService.getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
                     tbMemberCertificate.setPaidAmount(newPaidAmount);
                     tbMemberCertificate.setInAccount(inAccount);
-                    paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                    paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
                     tbMemberCertificate.setPaymentStatus(paymentStatus);
                     //插入来款记录表
                     payPaymentRecord.setId(null);
@@ -694,7 +693,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     }
                     payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
-                    paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
                     tbMemberCertificate.setPaymentStatus(paymentStatus);
                     tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
 
@@ -743,28 +742,44 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
      * @param amountReceivable  应收
      * @param paidAmount    实收
      * @param paymentStatus 缴费状态
+     * @param changeReceivableAmountFlag 更改待确收金额标识
      * @return
      */
     @Override
-    public String getPaymentStatus(BigDecimal amountReceivable,BigDecimal paidAmount,String paymentStatus){
+    public String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag){
         if(amountReceivable == null){
             amountReceivable = new BigDecimal("0.00");
         }
         if(paidAmount == null){
             paidAmount = new BigDecimal("0.00");
         }
+        if (changeReceivableAmountFlag){
+            //  实收金额 < 待确收金额 && 不等于待审核/已拒绝
+            if(paidAmount.compareTo(amountReceivable) < 0
+                    && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
+                    && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
+                paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
+            }
+            // 应收>0 && 实收金额 == 待确收金额 && 不等于待审核
+            if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
+                    && paidAmount.compareTo(amountReceivable) == 0
+                    && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
+                paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
+            }
+        }else {
+            //  实收金额 < 待确收金额 && 不等于待审核/已拒绝
+            if(paidAmount.compareTo(amountReceivable) < 0
+                    && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
+                    && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
+                paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
+            }
+            // 应收>0 && 实收金额 == 待确收金额
+            if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
+                    && paidAmount.compareTo(amountReceivable) == 0){
+                paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
+            }
+        }
 
-        //  实收金额 < 待确收金额 && 不等于待审核/已拒绝
-        if(paidAmount.compareTo(amountReceivable) < 0
-                && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
-                && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
-            paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
-        }
-        // 应收>0 && 实收金额 == 待确收金额
-        if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
-                && paidAmount.compareTo(amountReceivable) == 0){
-            paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
-        }
         return paymentStatus;
     }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 4128656b..a01a05a3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -411,7 +411,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payCommonProject.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, paymentStatus, false);//缴费状态
                 tax = addPaidAmount(payCommonProject.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = addPaidAmount(payCommonProject.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 payCommonProject.setPaidTax(tax);
@@ -442,7 +443,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payWorking.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, paymentStatus, false);//缴费状态
                 tax = addPaidAmount(payWorking.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = addPaidAmount(payWorking.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 payWorking.setPaidTax(tax);
@@ -471,7 +473,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = meeting.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
                 tax = addPaidAmount(meeting.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = addPaidAmount(meeting.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 meeting.setPaidTax(tax);
@@ -498,7 +501,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = member.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
                 tax = addPaidAmount(member.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = addPaidAmount(member.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 member.setPaidTax(tax);
@@ -528,7 +532,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = tbMember.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
                 tax = addPaidAmount(tbMember.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = addPaidAmount(tbMember.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 tbMember.setPaidTax(tax);
@@ -560,7 +565,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(tbMemberCertificate.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = tbMemberCertificate.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
                 tax = addPaidAmount(tbMemberCertificate.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = addPaidAmount(tbMemberCertificate.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 tbMemberCertificate.setPaidTax(tax);
@@ -1258,7 +1264,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         String projectId = param.getProjectId();
         Integer projectType = param.getProjectType();
         BigDecimal receivableAmount = param.getReceivableAmount();
-
+        boolean changeReceivableAmountFlag = true;
         //到账金额
         BigDecimal paidAmount;
         //缴费凭证状态
@@ -1301,7 +1307,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payCommonProject.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
-                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payCommonProject.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
                 payCommonProject.setPaymentStatus(paymentStatus);
                 payCommonProject.setInAccount(inAccount);
                 //确认收入状态
@@ -1332,7 +1339,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payWorking.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
-                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payWorking.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
                 payWorking.setPaymentStatus(paymentStatus);
                 payWorking.setInAccount(inAccount);
                 //确认收入状态
@@ -1363,7 +1371,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 meetingSituation.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
-                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = meetingSituation.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
                 meetingSituation.setPaymentStatus(paymentStatus);
                 meetingSituation.setInAccount(inAccount);
                 //确认收入状态
@@ -1394,7 +1403,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 member.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
-                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = member.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
                 member.setPaymentStatus(paymentStatus);
                 member.setInAccount(inAccount);
                 //确认收入状态
@@ -1425,7 +1435,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 projectSubitem.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
-                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = projectSubitem.getPaymentStatus();
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
                 projectSubitem.setPaymentStatus(paymentStatus);
                 projectSubitem.setInAccount(inAccount);
                 //确认收入状态
@@ -1582,7 +1593,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =subtract(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
                 tax = subtract(payCommonProject.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = subtract(payCommonProject.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 payCommonProject.setPaidTax(tax);
@@ -1602,7 +1613,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =subtract(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
                 tax = subtract(payWorking.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = subtract(payWorking.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 payWorking.setPaidTax(tax);
@@ -1621,7 +1632,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =subtract(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
                 tax = subtract(meeting.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = subtract(meeting.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 meeting.setPaidTax(tax);
@@ -1641,7 +1652,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =subtract(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
                 tax = subtract(member.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = subtract(member.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 member.setPaidTax(tax);
@@ -1660,7 +1671,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =subtract(projectSubitem.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(projectSubitem.getAmountReceivable(), newPaidAmount);//到账状态
-                paymentStatus = payPaymentCheckService.getPaymentStatus(projectSubitem.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(projectSubitem.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
                 tax = subtract(projectSubitem.getPaidTax(),payPaymentRecord.getTax());
                 noTaxAmount = subtract(projectSubitem.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
                 projectSubitem.setPaidTax(tax);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index 7a277cc9..83d39255 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -256,7 +256,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
                 payCommonProject.setMail(projectStatusVO.getMail());
             }
         }
-        String paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus());
+        String paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus(), false);
         payCommonProject.setPaymentStatus(paymentStatus);
         payCommonProjectService.updateById(payCommonProject);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index c37bbffa..a8d32242 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -444,7 +444,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 payWorkingGroupSubItem.setMail(projectStatusVO.getMail());
             }
         }
-        String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus());
+        String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus(), false);
         payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
         payWorkingGroupSubItem.setInAccount(null);
         payWorkingGroupSubItem.setPaidAmount(null);
@@ -621,7 +621,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 payWorkingGroupSubItem.setMail(projectStatusVO.getMail());
             }
         }
-        String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus());
+        String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus(), false);
         payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
         payWorkingGroupSubItem.setInAccount(null);
         payWorkingGroupSubItem.setPaidAmount(null);
@@ -1172,7 +1172,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                         updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMail, projectStatusVO.getMail());
                     }
                 }
-                String paymentStatus = payPaymentCheckService.getPaymentStatus(input.getReceivableAmount(), p.getPaidAmount(), p.getPaymentStatus());
+                String paymentStatus = payPaymentCheckService.getPaymentStatus(input.getReceivableAmount(), p.getPaidAmount(), p.getPaymentStatus(), false);
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPaymentStatus, paymentStatus);
                 updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId, p.getId());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeWay, PayProjectCommon.CHARGE_WAY3);