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

Merge remote-tracking branch 'origin/branch20211210' into branch20211210

Browse Source
This commit is contained in:
baozhipeng
2021-12-20 14:43:00 +08:00
parent 7a06e4fa78 7422fb7515
commit 15a599b223
8 changed files with 114 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+23 -7
View File
@@ -170,7 +170,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
}
//证书到账推送到会员系统
if(typr6List.size()>0){
JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr5List);
JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
}
}
/**
@@ -512,15 +512,22 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
tbMember.setMemberNo(memberInfo.getMemberNo());
tbMember.setMemberType(memberInfo.getMemberType());
tbMember.setMemberStatus(memberInfo.getMemberStatus());
tbMemberProjectSubitemMapper.updateById(tbMember);
tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
}else {
tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
}
tbMemberProjectSubitemMapper.updateById(tbMember);
//插入来款记录表
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
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));
@@ -550,14 +557,23 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表
certificatePayment.setPaidAmount(newPaidAmount);
certificatePayment.setInAccount(inAccount);
certificatePaymentMapper.updateById(certificatePayment);
certificatePayment.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
}else {
certificatePayment.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
}
certificatePaymentMapper.updateById(certificatePayment);
//插入来款记录表
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
if (sysUser!=null) {
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
}else {
payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
payPaymentRecord.setReviewerName("标协管理员");
}
payPaymentRecord.setReviewTime(new Date());
payPaymentRecord.setProjectId(certificatePayment.getId());
payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE6));