From b594b8bce518e6b574e6eed6ec8d2d787c6d74b0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jul 2024 16:08:32 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=BE=85=E7=A1=AE?=
 =?UTF-8?q?=E6=94=B6=E9=87=91=E9=A2=9D=E5=90=8E=20=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java       |  2 +-
 .../service/impl/PayPaymentRecordServiceImpl.java  | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 9d90ef2a..27131bbb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -596,7 +596,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             payPaymentRecord.setProjectId(payMeetingSituation.getId());
             payPaymentRecord.setProof(payMeetingSituation.getPaymentRecord());
             payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
-            payPaymentRecord.setAmountReceived(payMeetingSituation.getAmountReceivable());
+            payPaymentRecord.setAmountReceived(payMeetingSituation.getAmountReceivable().subtract(payMeetingSituation.getPaidAmount()));
             payPaymentRecord.setPaymentDate(new Date());
             payPaymentRecords.add(payPaymentRecord);
             //添加来款
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 49f1f8f9..673dbe45 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
@@ -1261,6 +1261,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
         //到账金额
         BigDecimal paidAmount;
+        //缴费凭证状态
+        String paymentStatus;
         //确认收入金额
         BigDecimal confirmAmount;
         //开票金额
@@ -1299,6 +1301,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payCommonProject.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                payCommonProject.setPaymentStatus(paymentStatus);
                 payCommonProject.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1328,6 +1332,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payWorking.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                payWorking.setPaymentStatus(paymentStatus);
                 payWorking.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1357,6 +1363,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 meetingSituation.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                meetingSituation.setPaymentStatus(paymentStatus);
                 meetingSituation.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1386,6 +1394,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 member.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                member.setPaymentStatus(paymentStatus);
                 member.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1415,6 +1425,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 projectSubitem.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                projectSubitem.setPaymentStatus(paymentStatus);
                 projectSubitem.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1446,6 +1458,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payPackCompany.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                //paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                //payPackCompany.set(paymentStatus);
                 payPackCompany.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);