LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

到账开票，打包添加会议成员审核认证

Browse Source
This commit is contained in:
梁琦涛
2021-10-19 17:28:49 +08:00
parent 1a53f10c64
commit e3257bf4be
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+24
View File
@@ -328,6 +328,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){
return "开票金额大于当前未开票金额，输入有误！";
}
PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
return "企业未审核，需要审核后开票";
}
break;
// 工作组项目
case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -349,6 +353,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){
return "开票金额大于当前未开票金额，输入有误！";
}
PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(workingGroup.getChargeCompanyTemporaryId());
if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
return "企业未审核，需要审核后开票";
}
break;
//会议项目
case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -370,6 +378,14 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){
return "开票金额大于当前未开票金额，输入有误！";
}
// 缺少会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以来款 (0未审核,1已通过)
if(Objects.equals(meeting.getRegisterCheckResult(),0)){
return "报名信息未审核，需要审核后开票";
}
PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
return "企业未审核，需要审核后开票";
}
break;
//会员项目
case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -391,6 +407,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){
return "开票金额大于当前未开票金额，输入有误！";
}
PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(memberProject.getCompanyTemporaryId());
if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
return "企业未审核，需要审核后开票";
}
break;
//标协会员
case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -412,6 +432,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
return "开票金额应等于当前未开票金额，输入有误！";
}
PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
return "企业未审核，需要审核后开票";
}
break;
default:
break;