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 40c4e072..2a5bb564 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 @@ -16,6 +16,7 @@ import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayCompanyManagementMapper; import com.jero.company.mapper.PayContactsManagementMapper; +import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.PayMailBillVO; @@ -99,8 +100,11 @@ public class PayMailBillServiceImpl extends ServiceImpl selectMailBillVO(String projectId) { @@ -314,6 +318,10 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){ - return "开票金额大于当前欠未开票金额,输入有误!"; + return "开票金额大于当前未开票金额,输入有误!"; + } + PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(memberProject.getCompanyTemporaryId()); + if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){ + return "企业未审核,需要审核后开票"; } break; //标协会员 @@ -398,15 +419,14 @@ public class PayMailBillServiceImpl extends ServiceImpl