From beb4e7952d0c26bc337dedc41f2c45c330e111ba Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 11 Mar 2024 11:34:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B1=BB=E5=9E=8B=E5=80=BC=E4=B8=BA8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/contract/common/PayIncomeContractCommon.java     | 2 +-
 .../com/jero/mail/service/impl/PayMailBillServiceImpl.java    | 4 ++--
 .../payment/service/impl/PayConfirmPaymentRecordService.java  | 2 +-
 .../payment/service/impl/PayPaymentRecordServiceImpl.java     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
index f54f21ae..ef6dfd93 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
@@ -78,7 +78,7 @@ public class PayIncomeContractCommon {
     /**
      * 7:打包项目
      */
-    public final static String PROJECT_TYPE7 = "7";
+    public final static String PROJECT_TYPE8 = "8";
     /**
      * 来款状态 0：全部 1:到期未付款
      */
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 69a12099..1a0db94a 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
@@ -393,7 +393,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                         }
                         break;
                     //打包项目
-                    case PayIncomeContractCommon.PROJECT_TYPE7:
+                    case PayIncomeContractCommon.PROJECT_TYPE8:
                         PayPackCompany payPackCompany = payPackCompanyService.getById(p.getProjectId());
                         if (Objects.isNull(payPackCompany)) {
                             throw new JeroBootException("项目不存在！");
@@ -973,7 +973,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     //    return "标协证书项目必须先审核通过才可开票";
                     //}
                     // 普通项目
-                case PayIncomeContractCommon.PROJECT_TYPE7:
+                case PayIncomeContractCommon.PROJECT_TYPE8:
                     PayPackCompany payPackCompany = payPackCompanyService.getById(bmpList.get(i).getProjectId());
                     //将第一个项目作为基准公司
                     if (i == 0) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
index 834e7ac5..b2547751 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
@@ -182,7 +182,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
                 }
                 break;
             // 打包项目
-            case PayIncomeContractCommon.PROJECT_TYPE7:
+            case PayIncomeContractCommon.PROJECT_TYPE8:
                 PayPackCompany payPackCompany = payPackCompanyService.getById(projectId);
                 if (payPackCompany == null) {
                     throw new JeroBootException("项目不存在");
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 24c1cec4..174a34fa 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
@@ -564,7 +564,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 break;
             // 打包项目
-            case PayIncomeContractCommon.PROJECT_TYPE7:
+            case PayIncomeContractCommon.PROJECT_TYPE8:
 
                 PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId());
                 newPaidAmount = addPaidAmount(payPackCompany.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收