From 4b15aa1fb07d23c8e3fcbb1e62d692d7ac104f99 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 23 Dec 2021 15:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/mail/service/impl/PayMailBillServiceImpl.java  | 6 ++++++
 .../payment/service/impl/PayPaymentRecordServiceImpl.java   | 4 ++++
 2 files changed, 10 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 02e1ad78..63c0ad8d 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
@@ -692,6 +692,9 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
                         return "企业未审核，需要审核后开票";
                     }
+                    if(1!=tbMemberProject.getInAccount()){
+                        return "标协会员项目必须先审核通过才可开票";
+                    }
                     break;
                 //标协证书
                 case PayIncomeContractCommon.PROJECT_TYPE6:
@@ -717,6 +720,9 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(!Objects.isNull(payCompanyManagementTbMemberCer) && "2".equals(payCompanyManagementTbMemberCer.getStatus()) ){
                         return "企业未审核，需要审核后开票";
                     }
+                    if(1!=tbMemberCertificate.getInAccount()){
+                        return "标协证书项目必须先审核通过才可开票";
+                    }
                     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 24df2b78..4803ae24 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
@@ -157,6 +157,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     commonProject.setCheckPaymentStatus(recordSub.getPaymentStatus());
                 }
             }
+            if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
+                commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
+            }
         }
         return list;
     }
@@ -760,6 +763,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         if(paidAmount.compareTo(zero)==0){
             return 0;
         }else{
+            //无意义
             return 4;
         }