来款审核

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;

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;
         }