From ed7b94a461a3e16020ecabc543816326c2ddde81 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Mar 2024 15:13:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9D=A5=E6=AC=BE=E5=BC=80=E7=A5=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 67 ++++++++++++++++++-
 .../impl/PayPaymentRecordServiceImpl.java     | 10 ++-
 2 files changed, 73 insertions(+), 4 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 1a0db94a..a9be5dca 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
@@ -403,8 +403,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                         if (!Objects.isNull(payPackCompanyTemporary)) {
                             listId.add(payPackCompanyTemporary);
                         }
-                        PayCompanyManagement company = payCompanyManagementService.getById(payPackCompany.getCompanyId());
-                        project = company.getCompanyName();
+                        project = payPackCompany.getCompanyTemporaryName();
                         break;
                     default:
                         break;
@@ -725,6 +724,21 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,memberProject.getInvoiceNoTaxAmount());
                 tax = payPaymentRecordService.subtractPaidAmount(tax,memberProject.getInvoiceTax());
                 break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = payPackCompanyService.getById(payMailBillProject.getProjectId());
+                amountReceivable = payPackCompany.getReceivableAmount();//应收
+                needInvoice = payPackCompany.getNeedInvoice();//是否需要发票
+                oldInvoiceAmount = payPackCompany.getInvoiceAmount();
+                if(oldInvoiceAmount==null){
+                    oldInvoiceAmount= new BigDecimal("0");
+                }
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.subtract(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+                //税额
+                noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,payPackCompany.getInvoiceNoTaxAmount());
+                tax = payPaymentRecordService.subtractPaidAmount(tax,payPackCompany.getInvoiceTax());
+                break;
             default:
                 break;
         }
@@ -794,6 +808,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 newMemberProject.setInvoiceTax(tax);
                 payMemberProjectSubitemMapper.updateById(newMemberProject);
                 break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = new PayPackCompany();
+                payPackCompany.setId(payMailBillProject.getProjectId());
+                payPackCompany.setMakeInvoice(makeInvoice);
+                payPackCompany.setInvoiceAmount(invoiceAmount);
+                payPackCompany.setInvoiceNoTaxAmount(noTaxAmount);
+                payPackCompany.setInvoiceTax(tax);
+                payPackCompanyService.updateById(payPackCompany);
+                break;
             default:
                 break;
         }
@@ -972,7 +996,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     //if(1!=tbMemberCertificate.getInAccount()){
                     //    return "标协证书项目必须先审核通过才可开票";
                     //}
-                    // 普通项目
+                // 打包项目
                 case PayIncomeContractCommon.PROJECT_TYPE8:
                     PayPackCompany payPackCompany = payPackCompanyService.getById(bmpList.get(i).getProjectId());
                     //将第一个项目作为基准公司
@@ -1235,6 +1259,33 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     principalId.append(",").append(tbProjectCer.getDirectorId());
                 }
                 break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = payPackCompanyService.getById(payMailBillProject.getProjectId());
+                amountReceivable = payPackCompany.getReceivableAmount();//应收
+                needInvoice = payPackCompany.getNeedInvoice();//是否需要发票
+                oldInvoiceAmount = payPackCompany.getInvoiceAmount();
+                if(oldInvoiceAmount==null){
+                    oldInvoiceAmount= new BigDecimal("0");
+                }
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+                //税额
+                noTaxAmount = payPaymentRecordService.addPaidAmount(noTaxAmount,payPackCompany.getInvoiceNoTaxAmount());
+                tax = payPaymentRecordService.addPaidAmount(tax,payPackCompany.getInvoiceTax());
+                //逗号拼接邮寄信息
+                if(i==0){
+                    projectName.append(payPackCompany.getCompanyTemporaryName());
+                    chargeCompanyName.append(payPackCompany.getCompanyTemporaryName());
+                    principalName.append(payPackCompany.getPackPrincipalName());
+                    principalId.append(payPackCompany.getPackPrincipalId());
+                }else{
+                    projectName.append(",").append(payPackCompany.getCompanyTemporaryName());
+                    chargeCompanyName.append(",").append(payPackCompany.getCompanyTemporaryName());
+                    principalName.append(",").append(payPackCompany.getPackPrincipalName());
+                    principalId.append(",").append(payPackCompany.getPackPrincipalId());
+                }
+                break;
             default:
                 break;
         }
@@ -1324,6 +1375,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 newCertificate.setInvoiceTax(tax);
                 certificatePaymentMapper.updateById(newCertificate);
                 break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = new PayPackCompany();
+                payPackCompany.setId(payMailBillProject.getProjectId());
+                payPackCompany.setMakeInvoice(makeInvoice);
+                payPackCompany.setInvoiceAmount(invoiceAmount);
+                payPackCompany.setInvoiceNoTaxAmount(noTaxAmount);
+                payPackCompany.setInvoiceTax(tax);
+                payPackCompanyService.updateById(payPackCompany);
+                break;
             default:
                 break;
         }
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 e6344d03..df795f5c 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
@@ -567,6 +567,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             case PayIncomeContractCommon.PROJECT_TYPE8:
 
                 PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId());
+                PayContactsManagementTemporary payPackProjectTemporary = payContactsManagementTemporaryService.getById(payPackCompany.getPackContactTemporaryId());
+                if (!Objects.isNull(payPackProjectTemporary)) {
+                    listId.add(payPackProjectTemporary);
+                }
+                principalId = payPackCompany.getPackPrincipalId();
+                project = payPackCompany.getCompanyTemporaryName();
+
                 newPaidAmount = addPaidAmount(payPackCompany.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payPackCompany.getReceivableAmount(), newPaidAmount);//到账状态
                 tax = addPaidAmount(payPackCompany.getPaidTax(),payPaymentRecord.getTax());
@@ -578,7 +585,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payPackCompany.setInAccount(inAccount);
                 payPackCompanyService.updateById(payPackCompany);
                 break;
-            default:break;
+            default:
+                break;
         }
         //插入来款记录表
         payPaymentRecord.setId(null);