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

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

Browse Source
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
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
+5 -8
View File
@@ -485,6 +485,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
@Override @Override
public void addFromStandards(PayMailBill payMailBill) { public void addFromStandards(PayMailBill payMailBill) {
String tbPaymentId = payMailBill.getProjectId(); String tbPaymentId = payMailBill.getProjectId();
BigDecimal invoiceAmount = payMailBill.getInvoiceAmount();
BigDecimal amountReceivable; BigDecimal amountReceivable;
String memberProjectId; String memberProjectId;
String projectId; String projectId;
@@ -494,28 +495,24 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TbMemberProjectSubitem::getTbPaymentId,tbPaymentId); wrapper.eq(TbMemberProjectSubitem::getTbPaymentId,tbPaymentId);
TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectOne(wrapper); TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectOne(wrapper);
amountReceivable = tbMember.getAmountReceivable();
memberProjectId = tbMember.getProjectId(); memberProjectId = tbMember.getProjectId();
projectId = tbMember.getId(); projectId = tbMember.getId();
companyName = tbMember.getCompanyName(); companyName = tbMember.getCompanyName();
tbMember.setMakeInvoice(1); tbMember.setMakeInvoice(1);
tbMember.setMail(1); tbMember.setMail(1);
tbMember.setInvoiceAmount(amountReceivable); tbMember.setInvoiceAmount(invoiceAmount);
tbMember.setPaidAmount(amountReceivable);
tbMemberProjectSubitemMapper.updateById(tbMember); tbMemberProjectSubitemMapper.updateById(tbMember);
}else { }else {
LambdaQueryWrapper<TbCertificatePayment> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbCertificatePayment> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TbCertificatePayment::getTbPaymentId,tbPaymentId); wrapper.eq(TbCertificatePayment::getTbPaymentId,tbPaymentId);
TbCertificatePayment certificatePayment = certificatePaymentMapper.selectOne(wrapper); TbCertificatePayment certificatePayment = certificatePaymentMapper.selectOne(wrapper);
amountReceivable = certificatePayment.getAmountReceivable();
memberProjectId = certificatePayment.getProjectId(); memberProjectId = certificatePayment.getProjectId();
projectId = certificatePayment.getId(); projectId = certificatePayment.getId();
companyName = certificatePayment.getCompanyName(); companyName = certificatePayment.getCompanyName();
certificatePayment.setMakeInvoice(1); certificatePayment.setMakeInvoice(1);
certificatePayment.setMail(1); certificatePayment.setMail(1);
certificatePayment.setInvoiceAmount(amountReceivable); certificatePayment.setInvoiceAmount(invoiceAmount);
certificatePayment.setPaidAmount(amountReceivable);
certificatePaymentMapper.updateById(certificatePayment); certificatePaymentMapper.updateById(certificatePayment);
} }
@@ -523,7 +520,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
TbMemberProject tbMemberProject = tbMemberProjectMapper.selectById(memberProjectId); TbMemberProject tbMemberProject = tbMemberProjectMapper.selectById(memberProjectId);
payMailBill.setProjectName(tbMemberProject.getProjectName()); payMailBill.setProjectName(tbMemberProject.getProjectName());
payMailBill.setChargeCompanyName(companyName); payMailBill.setChargeCompanyName(companyName);
payMailBill.setInvoiceAmount(amountReceivable); payMailBill.setInvoiceAmount(invoiceAmount);
payMailBill.setPostStatus(1); payMailBill.setPostStatus(1);
payMailBill.setPrincipalName("标协管理者"); payMailBill.setPrincipalName("标协管理者");
payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile())); payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile()));
@@ -534,7 +531,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
bmp.setBillId(payMailBill.getId()); bmp.setBillId(payMailBill.getId());
bmp.setProjectId(projectId); bmp.setProjectId(projectId);
bmp.setProjectType(projectType); bmp.setProjectType(projectType);
bmp.setInvoiceAmount(amountReceivable); bmp.setInvoiceAmount(invoiceAmount);
payMailBillProjectService.save(bmp); payMailBillProjectService.save(bmp);
} }
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+13 -14
View File
@@ -521,24 +521,23 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
tbMember.setMemberStatus(memberInfo.getMemberStatus()); tbMember.setMemberStatus(memberInfo.getMemberStatus());
tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode()); tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode()); payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
//插入来款记录表
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (sysUser!=null) {
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
}else {
payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
payPaymentRecord.setReviewerName("标协管理员");
}
payPaymentRecord.setReviewTime(new Date());
payPaymentRecord.setProjectId(tbMember.getId());
payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
payPaymentRecordMapper.insert(payPaymentRecord);
}else { }else {
tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode()); tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
} }
tbMemberProjectSubitemMapper.updateById(tbMember); tbMemberProjectSubitemMapper.updateById(tbMember);
//插入来款记录表
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (sysUser!=null) {
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
}else {
payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
payPaymentRecord.setReviewerName("标协管理员");
}
payPaymentRecord.setReviewTime(new Date());
payPaymentRecord.setProjectId(tbMember.getId());
payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
payPaymentRecordMapper.insert(payPaymentRecord);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }