This commit is contained in:
baozhipeng
2022-02-17 15:02:49 +08:00
parent a4ccdec5c7
commit ec7014bdb4
@@ -693,7 +693,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
}
//之前开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额>应收
//开票总额!=应收
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
return "开票金额应等于当前未开票金额,输入有误!";
}
@@ -721,7 +721,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
}
//之前开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额>应收
//开票总额!=应收
if(invoiceAmount.compareTo(tbMemberCertificate.getAmountReceivable()) != 0){
return "开票金额应等于当前未开票金额,输入有误!";
}
@@ -1162,10 +1162,48 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
break;
//标协会员
case PayIncomeContractCommon.PROJECT_TYPE5:
return "标协会员类型不可编辑!";
TbMemberProjectSubitem tbMemberProject = tbMemberProjectSubitemMapper.selectById(oldBmp.getProjectId());
amountReceivable = tbMemberProject.getAmountReceivable();//应收
needInvoice = tbMemberProject.getInvoiceRequirements();//是否需要发票
//之前开票总额-编辑之前的开票金额
oldInvoiceAmount = tbMemberProject.getInvoiceAmount().subtract(oldBmp.getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
if(oldInvoiceAmount==null){
oldInvoiceAmount= new BigDecimal("0");
}
//原始开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(bm.getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额!=应收
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
return "开票金额应等于当前未开票金额,输入有误!";
}
PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){
return "企业未审核,需要审核后开票";
}
break;
//标协证书
case PayIncomeContractCommon.PROJECT_TYPE6:
return "标协证书类型不可编辑!";
TbCertificatePayment tbMemberCertificate = certificatePaymentMapper.selectById(oldBmp.getProjectId());
amountReceivable = tbMemberCertificate.getAmountReceivable();//应收
needInvoice = tbMemberCertificate.getInvoiceRequirements();//是否需要发票
//之前开票总额-编辑之前的开票金额
oldInvoiceAmount = tbMemberCertificate.getInvoiceAmount().subtract(oldBmp.getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
if(oldInvoiceAmount==null){
oldInvoiceAmount= new BigDecimal("0");
}
//原始开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(bm.getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额!=应收
if(invoiceAmount.compareTo(tbMemberCertificate.getAmountReceivable()) != 0){
return "开票金额应等于当前未开票金额,输入有误!";
}
PayCompanyManagement payCompanyManagementTbMemberCer = payCompanyManagementService.getById(tbMemberCertificate.getCompanyId());
if(!Objects.isNull(payCompanyManagementTbMemberCer) && payCompanyManagementTbMemberCer.getStatus()==2 ){
return "企业未审核,需要审核后开票";
}
break;
default:
break;
}