From 28d19194da0b63fd2a22bd096f817da6f059fd8c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 17:19:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083127=2083180=20=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentCheckServiceImpl.java      | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

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 3050c0e3..2956ad02 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
@@ -599,40 +599,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 TbCheckVo tbCheckVo = new TbCheckVo();
 
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
-                    //已同意
-                    //如果没有发票就存入0
-                    BigDecimal noTaxAmount;
-                    BigDecimal tax;
-                    BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
-                    if (tbMember.getInvoiceRequirements() == 0) {
-                        noTaxAmount = amountReceived;
-                        tax = BigDecimal.ZERO;
-                    }else {
-                        noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
-                        tax = amountReceived.subtract(noTaxAmount);
-                    }
-                    payPaymentRecord.setTax(tax);
-                    payPaymentRecord.setNoTaxAmount(noTaxAmount);
-                    //来款条件校验
-                    payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+                    List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
+                    payPaymentRecords.add(payPaymentRecord);
+                    payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
 
-                    newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
-                    inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
-                    tbMember.setPaidAmount(newPaidAmount);
-                    tbMember.setInAccount(inAccount);
-                    paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
-                    tbMember.setPaymentStatus(paymentStatus);
-                    //插入来款记录表
-                    payPaymentRecord.setId(null);
-                    payPaymentRecord.setPaymentStatus(paymentStatus);
-                    payPaymentRecord.setNoTaxAmount(noTaxAmount);
-                    payPaymentRecord.setTax(tax);
-                    payPaymentRecordMapper.insert(payPaymentRecord);
-                    //保存税额
-                    tbMember.setConfirmTax(tax);
-                    tbMember.setConfirmNoTaxAmount(noTaxAmount);
-
-                    tbCheckVo.setCheckResult(PayProjectCommon.YES);
                     //发消息
                     PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbMember.getLiaisonManId());
                     if(!Objects.isNull(tbMemberPayContactsManagement)){