From b23396c3d6887ec85df2a389e95f5ab0b3b5a99e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Mar 2024 09:30:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082833=20=E6=89=93=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E5=BC=80=E7=A5=A8=E7=9A=84=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E5=BE=85=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 3e34b66c..9a4f7268 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -1614,6 +1614,30 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 noTaxAmount = payPaymentRecordService.addPaidAmount(noTaxAmount,oldNoTaxAmount);
                 tax = payPaymentRecordService.addPaidAmount(tax,oldTax);
                 break;
+            // 普通项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = payPackCompanyService.getById(oldBmp.getProjectId());
+                amountReceivable = payPackCompany.getReceivableAmount();//应收
+                needInvoice = payPackCompany.getNeedInvoice();//是否需要发票
+
+                //之前开票总额-编辑之前的开票金额
+                oldInvoiceAmount = payPackCompany.getInvoiceAmount().subtract(oldBmp.getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                if(oldInvoiceAmount==null){
+                    oldInvoiceAmount= new BigDecimal("0");
+                }
+                //原始开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(thisInvoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+                //开票总额>应收
+                if(invoiceAmount.compareTo(payPackCompany.getReceivableAmount()) == 1){
+                    return "开票金额大于当前未开票金额，输入有误！";
+                }
+                //之前的税额
+                oldNoTaxAmount = payPackCompany.getInvoiceNoTaxAmount().subtract(oldBmp.getNoTaxAmount());
+                oldTax = payPackCompany.getInvoiceTax().subtract(oldBmp.getTax());
+                //税额
+                noTaxAmount = payPaymentRecordService.addPaidAmount(noTaxAmount,oldNoTaxAmount);
+                tax = payPaymentRecordService.addPaidAmount(tax,oldTax);
+                break;
             default:
                 break;
         }
@@ -1702,6 +1726,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 newCertificate.setInvoiceTax(tax);
                 certificatePaymentMapper.updateById(newCertificate);
                 break;
+            // 普通项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany newPack = new PayPackCompany();
+                newPack.setId(oldBmp.getProjectId());
+                newPack.setMakeInvoice(makeInvoice);
+                newPack.setInvoiceAmount(invoiceAmount);
+                newPack.setInvoiceNoTaxAmount(noTaxAmount);
+                newPack.setInvoiceTax(tax);
+                payPackCompanyService.updateById(newPack);
+                break;
             default:
                 break;
         }