fix fix 45775 在会员系统开票1元,在来款系统显示全额了

This commit is contained in:
lijiarao
2021-12-22 17:02:25 +08:00
parent 40ab321d0f
commit b8e7fdbd9d
2 changed files with 18 additions and 22 deletions
@@ -485,6 +485,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
@Override
public void addFromStandards(PayMailBill payMailBill) {
String tbPaymentId = payMailBill.getProjectId();
BigDecimal invoiceAmount = payMailBill.getInvoiceAmount();
BigDecimal amountReceivable;
String memberProjectId;
String projectId;
@@ -494,28 +495,24 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TbMemberProjectSubitem::getTbPaymentId,tbPaymentId);
TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectOne(wrapper);
amountReceivable = tbMember.getAmountReceivable();
memberProjectId = tbMember.getProjectId();
projectId = tbMember.getId();
companyName = tbMember.getCompanyName();
tbMember.setMakeInvoice(1);
tbMember.setMail(1);
tbMember.setInvoiceAmount(amountReceivable);
tbMember.setPaidAmount(amountReceivable);
tbMember.setInvoiceAmount(invoiceAmount);
tbMemberProjectSubitemMapper.updateById(tbMember);
}else {
LambdaQueryWrapper<TbCertificatePayment> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TbCertificatePayment::getTbPaymentId,tbPaymentId);
TbCertificatePayment certificatePayment = certificatePaymentMapper.selectOne(wrapper);
amountReceivable = certificatePayment.getAmountReceivable();
memberProjectId = certificatePayment.getProjectId();
projectId = certificatePayment.getId();
companyName = certificatePayment.getCompanyName();
certificatePayment.setMakeInvoice(1);
certificatePayment.setMail(1);
certificatePayment.setInvoiceAmount(amountReceivable);
certificatePayment.setPaidAmount(amountReceivable);
certificatePayment.setInvoiceAmount(invoiceAmount);
certificatePaymentMapper.updateById(certificatePayment);
}
@@ -523,7 +520,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
TbMemberProject tbMemberProject = tbMemberProjectMapper.selectById(memberProjectId);
payMailBill.setProjectName(tbMemberProject.getProjectName());
payMailBill.setChargeCompanyName(companyName);
payMailBill.setInvoiceAmount(amountReceivable);
payMailBill.setInvoiceAmount(invoiceAmount);
payMailBill.setPostStatus(1);
payMailBill.setPrincipalName("标协管理者");
payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile()));
@@ -534,7 +531,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
bmp.setBillId(payMailBill.getId());
bmp.setProjectId(projectId);
bmp.setProjectType(projectType);
bmp.setInvoiceAmount(amountReceivable);
bmp.setInvoiceAmount(invoiceAmount);
payMailBillProjectService.save(bmp);
}