From 9e4118cfeacc8e3c45502a9bb5db07dcb691a6a7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 5 Jun 2023 17:47:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BC=96=E8=BE=91=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E6=97=B6=E9=87=91=E9=A2=9D=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentRecordServiceImpl.java     | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

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 878b23e0..2d01f7c0 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
@@ -1018,13 +1018,15 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 receivableAmount = payCommonProject.getReceivableAmount();//应收
                 paidAmount=payCommonProject.getPaidAmount().subtract(oldRecord.getAmountReceived()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                noTaxAmount=payCommonProject.getPaidNoTaxAmount().subtract(oldRecord.getNoTaxAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                tax=payCommonProject.getPaidTax().subtract(oldRecord.getTax()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
                 //是否还能再添加来款
                 isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
 
                 newPaidAmount =addPaidAmount(paidAmount,payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(receivableAmount, newPaidAmount);//到账状态
-                tax = addPaidAmount(payCommonProject.getPaidTax(),payPaymentRecord.getTax());
-                noTaxAmount = addPaidAmount(payCommonProject.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
+                tax = addPaidAmount(tax,payPaymentRecord.getTax());
+                noTaxAmount = addPaidAmount(noTaxAmount,payPaymentRecord.getNoTaxAmount());
                 payCommonProject.setPaidTax(tax);
                 payCommonProject.setPaidNoTaxAmount(noTaxAmount);
                 //更新主列表
@@ -1039,14 +1041,15 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 receivableAmount = payWorking.getReceivableAmount();//应收
                 paidAmount=payWorking.getPaidAmount().subtract(oldRecord.getAmountReceived()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
-
+                noTaxAmount=payWorking.getPaidNoTaxAmount().subtract(oldRecord.getNoTaxAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                tax=payWorking.getPaidTax().subtract(oldRecord.getTax()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
                 //是否还能再添加来款
                 isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
 
                 newPaidAmount =addPaidAmount(paidAmount,payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(receivableAmount, newPaidAmount);//到账状态
-                tax = addPaidAmount(payWorking.getPaidTax(),payPaymentRecord.getTax());
-                noTaxAmount = addPaidAmount(payWorking.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
+                tax = addPaidAmount(tax,payPaymentRecord.getTax());
+                noTaxAmount = addPaidAmount(noTaxAmount,payPaymentRecord.getNoTaxAmount());
                 payWorking.setPaidTax(tax);
                 payWorking.setPaidNoTaxAmount(noTaxAmount);
                 //更新主列表
@@ -1064,14 +1067,15 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }
                 receivableAmount = meeting.getAmountReceivable();//应收
                 paidAmount=meeting.getPaidAmount().subtract(oldRecord.getAmountReceived()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
-
+                noTaxAmount=meeting.getPaidNoTaxAmount().subtract(oldRecord.getNoTaxAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                tax=meeting.getPaidTax().subtract(oldRecord.getTax()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
                 //是否还能再添加来款
                 isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
 
                 newPaidAmount =addPaidAmount(paidAmount,payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(receivableAmount, newPaidAmount);//到账状态
-                tax = addPaidAmount(meeting.getPaidTax(),payPaymentRecord.getTax());
-                noTaxAmount = addPaidAmount(meeting.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
+                tax = addPaidAmount(tax,payPaymentRecord.getTax());
+                noTaxAmount = addPaidAmount(noTaxAmount,payPaymentRecord.getNoTaxAmount());
                 meeting.setPaidTax(tax);
                 meeting.setPaidNoTaxAmount(noTaxAmount);
                 //更新主列表
@@ -1086,14 +1090,15 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 receivableAmount = member.getAmountReceivable();//应收
                 paidAmount=member.getPaidAmount().subtract(oldRecord.getAmountReceived()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
-
+                noTaxAmount=member.getPaidNoTaxAmount().subtract(oldRecord.getNoTaxAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                tax=member.getPaidTax().subtract(oldRecord.getTax()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
                 //是否还能再添加来款
                 isAdd(receivableAmount, paidAmount,payPaymentRecord.getAmountReceived());
 
                 newPaidAmount =addPaidAmount(paidAmount,payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(receivableAmount, newPaidAmount);//到账状态
-                tax = addPaidAmount(member.getPaidTax(),payPaymentRecord.getTax());
-                noTaxAmount = addPaidAmount(member.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
+                tax = addPaidAmount(tax,payPaymentRecord.getTax());
+                noTaxAmount = addPaidAmount(noTaxAmount,payPaymentRecord.getNoTaxAmount());
                 member.setPaidTax(tax);
                 member.setPaidNoTaxAmount(noTaxAmount);
                 //更新主列表