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

update 标协会员开票撤销

Browse Source
This commit is contained in:
lijiarao
2024-03-27 17:52:24 +08:00
parent 13d7d2ded2
commit f85fb38024
1 changed files with 30 additions and 5 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
+30 -5
View File
@@ -720,6 +720,21 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,memberProject.getInvoiceNoTaxAmount()); noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,memberProject.getInvoiceNoTaxAmount());
tax = payPaymentRecordService.subtractPaidAmount(tax,memberProject.getInvoiceTax()); tax = payPaymentRecordService.subtractPaidAmount(tax,memberProject.getInvoiceTax());
break; break;
//标协会员项目
case PayIncomeContractCommon.PROJECT_TYPE5:
TbMemberProjectSubitem projectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBillProject.getProjectId());
amountReceivable = projectSubitem.getAmountReceivable();//应收
needInvoice = projectSubitem.getInvoiceRequirements();//是否需要发票
oldInvoiceAmount = projectSubitem.getInvoiceAmount();
if(oldInvoiceAmount==null){
oldInvoiceAmount= new BigDecimal("0");
}
//之前开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.subtract(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
//税额
noTaxAmount = payPaymentRecordService.subtractPaidAmount(noTaxAmount,projectSubitem.getInvoiceNoTaxAmount());
tax = payPaymentRecordService.subtractPaidAmount(tax,projectSubitem.getInvoiceTax());
break;
// 打包项目 // 打包项目
case PayIncomeContractCommon.PROJECT_TYPE8: case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = payPackCompanyService.getById(payMailBillProject.getProjectId()); PayPackCompany payPackCompany = payPackCompanyService.getById(payMailBillProject.getProjectId());
@@ -804,6 +819,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
newMemberProject.setInvoiceTax(tax); newMemberProject.setInvoiceTax(tax);
payMemberProjectSubitemMapper.updateById(newMemberProject); payMemberProjectSubitemMapper.updateById(newMemberProject);
break; break;
//标协会员项目
case PayIncomeContractCommon.PROJECT_TYPE5:
TbMemberProjectSubitem projectSubitem = new TbMemberProjectSubitem();
projectSubitem.setId(payMailBillProject.getProjectId());
projectSubitem.setMakeInvoice(makeInvoice);
projectSubitem.setInvoiceAmount(invoiceAmount);
projectSubitem.setInvoiceNoTaxAmount(noTaxAmount);
projectSubitem.setInvoiceTax(tax);
tbMemberProjectSubitemMapper.updateById(projectSubitem);
break;
// 打包项目 // 打包项目
case PayIncomeContractCommon.PROJECT_TYPE8: case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = new PayPackCompany(); PayPackCompany payPackCompany = new PayPackCompany();
@@ -953,9 +978,9 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
} }
//之前开票总额+本次开票金额 //之前开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP); invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额!=应收 //开票总额>应收
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){ if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
return "开票金额应等于当前未开票金额，输入有误！"; return "开票金额大于当前未开票金额，输入有误！";
} }
PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId()); PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){ if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){
@@ -1568,8 +1593,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
//原始开票总额+本次开票金额 //原始开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(thisInvoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP); invoiceAmount = oldInvoiceAmount.add(thisInvoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额!=应收 //开票总额!=应收
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){ if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
return "开票金额应等于当前未开票金额，输入有误！"; return "开票金额大于当前未开票金额，输入有误！";
} }
PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId()); PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){ if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){