From f85fb38024ba8f77dd28973e1ab64e33ea5f4fa5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Mar 2024 17:52:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

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 09908488..30705ce5 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
@@ -720,6 +720,21 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,memberProject.getInvoiceNoTaxAmount());
                 tax = payPaymentRecordService.subtractPaidAmount(tax,memberProject.getInvoiceTax());
                 break;
+            //标协会员项目
+            case PayIncomeContractCommon.PROJECT_TYPE5:
+                TbMemberProjectSubitem projectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBillProject.getProjectId());
+                amountReceivable = projectSubitem.getAmountReceivable();//应收
+                needInvoice = projectSubitem.getInvoiceRequirements();//是否需要发票
+                oldInvoiceAmount = projectSubitem.getInvoiceAmount();
+                if(oldInvoiceAmount==null){
+                    oldInvoiceAmount= new BigDecimal("0");
+                }
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.subtract(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+                //税额
+                noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,projectSubitem.getInvoiceNoTaxAmount());
+                tax = payPaymentRecordService.subtractPaidAmount(tax,projectSubitem.getInvoiceTax());
+                break;
             // 打包项目
             case PayIncomeContractCommon.PROJECT_TYPE8:
                 PayPackCompany payPackCompany = payPackCompanyService.getById(payMailBillProject.getProjectId());
@@ -804,6 +819,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 newMemberProject.setInvoiceTax(tax);
                 payMemberProjectSubitemMapper.updateById(newMemberProject);
                 break;
+            //标协会员项目
+            case PayIncomeContractCommon.PROJECT_TYPE5:
+                TbMemberProjectSubitem projectSubitem = new TbMemberProjectSubitem();
+                projectSubitem.setId(payMailBillProject.getProjectId());
+                projectSubitem.setMakeInvoice(makeInvoice);
+                projectSubitem.setInvoiceAmount(invoiceAmount);
+                projectSubitem.setInvoiceNoTaxAmount(noTaxAmount);
+                projectSubitem.setInvoiceTax(tax);
+                tbMemberProjectSubitemMapper.updateById(projectSubitem);
+                break;
             // 打包项目
             case PayIncomeContractCommon.PROJECT_TYPE8:
                 PayPackCompany payPackCompany = new PayPackCompany();
@@ -953,9 +978,9 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     }
                     //之前开票总额+本次开票金额
                     invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    //开票总额!=应收
-                    if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
-                        return "开票金额应等于当前未开票金额，输入有误！";
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
+                        return "开票金额大于当前未开票金额，输入有误！";
                     }
                     PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
                     if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){
@@ -1568,8 +1593,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 //原始开票总额+本次开票金额
                 invoiceAmount = oldInvoiceAmount.add(thisInvoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 //开票总额!=应收
-                if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
-                    return "开票金额应等于当前未开票金额，输入有误！";
+                if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
+                    return "开票金额大于当前未开票金额，输入有误！";
                 }
                 PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
                 if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){