From f2bf3872ccff44c9d1c276abdd170ba87924c2d9 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Mar 2024 14:44:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pack/mapper/xml/PayPackCompanyMapper.xml     |  1 +
 .../impl/PayPaymentRecordServiceImpl.java        | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
index 821c7c6b..f565d5ad 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
@@ -29,6 +29,7 @@
     </select>
     <select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
         select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
+        LEFT JOIN pay_payment_record ppr ON ppr.project_id = ppc.id
         LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
         LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = ppc.company_contact_temporary_id
         <where>
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 174a34fa..e6344d03 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
@@ -1348,6 +1348,22 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //标协证书
             case PayIncomeContractCommon.PROJECT_TYPE6:
                 throw new JeroBootException("标协证书类型不可撤销！");
+                // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany company = payPackCompanyService.getById(payPaymentRecord.getProjectId());
+
+                newPaidAmount = subtract(company.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
+                inAccount = getInAccount(company.getReceivableAmount(), newPaidAmount);//到账状态
+                tax = subtract(company.getPaidTax(),payPaymentRecord.getTax());
+                noTaxAmount = subtract(company.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
+                company.setPaidTax(tax);
+                company.setPaidNoTaxAmount(noTaxAmount);
+                //更新主列表
+                company.setPaidAmount(newPaidAmount);
+                company.setInAccount(inAccount);
+                payPackCompanyService.updateById(company);
+
+                break;
             default:break;
         }
         this.removeById(id);