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

fix 88057 到账开票-未审核先来款后，状态的确认

Browse Source
This commit is contained in:
lijiarao
2024-08-06 15:36:30 +08:00
parent c79478d8bf
commit c8bf5ed97d
1 changed files with 32 additions and 26 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
+32 -26
View File
@@ -182,19 +182,20 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
} }
//插入待审核状态，供前端判断是否显示审核按钮 //插入待审核状态，供前端判断是否显示审核按钮
//先查审核记录表有没有待审核的 //先查审核记录表有没有待审核的
if(projectIdPaymentStatusMap.containsKey(id)){ //if(projectIdPaymentStatusMap.containsKey(id)){
String paymentStatus = projectIdPaymentStatusMap.get(id); // String paymentStatus = projectIdPaymentStatusMap.get(id);
if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){ // if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
commonProject.setCheckPaymentStatus(paymentStatus); String paymentStatus = commonProject.getPaymentStatus();
continue; commonProject.setCheckPaymentStatus(paymentStatus);
} // continue;
} // }
//再查项目主表状态是不是待审核 //}
if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){ ////再查项目主表状态是不是待审核
if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){ //if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus()); // if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
} // commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
} // }
//}
//会议、标协会员、标协证书，来款单位拼接“未审核” //会议、标协会员、标协证书，来款单位拼接“未审核”
//if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))|| //if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
// commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))|| // commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||
@@ -420,7 +421,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表 //更新主列表
payCommonProject.setPaidAmount(newPaidAmount); payCommonProject.setPaidAmount(newPaidAmount);
payCommonProject.setInAccount(inAccount); payCommonProject.setInAccount(inAccount);
payCommonProject.setPaymentStatus(paymentStatus); if ("check".equals(checkOrRecord)){
payCommonProject.setPaymentStatus(paymentStatus);
}
payCommonProjectMapper.updateById(payCommonProject); payCommonProjectMapper.updateById(payCommonProject);
break; break;
@@ -452,7 +455,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表 //更新主列表
payWorking.setPaidAmount(newPaidAmount); payWorking.setPaidAmount(newPaidAmount);
payWorking.setInAccount(inAccount); payWorking.setInAccount(inAccount);
payWorking.setPaymentStatus(paymentStatus); if ("check".equals(checkOrRecord)){
payWorking.setPaymentStatus(paymentStatus);
}
payWorkingGroupSubItemMapper.updateById(payWorking); payWorkingGroupSubItemMapper.updateById(payWorking);
break; break;
@@ -482,7 +487,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表 //更新主列表
meeting.setPaidAmount(newPaidAmount); meeting.setPaidAmount(newPaidAmount);
meeting.setInAccount(inAccount); meeting.setInAccount(inAccount);
meeting.setPaymentStatus(paymentStatus); if ("check".equals(checkOrRecord)){
meeting.setPaymentStatus(paymentStatus);
}
payMeetingSituationMapper.updateById(meeting); payMeetingSituationMapper.updateById(meeting);
break; break;
@@ -511,7 +518,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表 //更新主列表
member.setPaidAmount(newPaidAmount); member.setPaidAmount(newPaidAmount);
member.setInAccount(inAccount); member.setInAccount(inAccount);
member.setPaymentStatus(paymentStatus); if ("check".equals(checkOrRecord)){
member.setPaymentStatus(paymentStatus);
}
payMemberProjectSubitemMapper.updateById(member); payMemberProjectSubitemMapper.updateById(member);
break; break;
@@ -541,7 +550,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表 //更新主列表
tbMember.setPaidAmount(newPaidAmount); tbMember.setPaidAmount(newPaidAmount);
tbMember.setInAccount(inAccount); tbMember.setInAccount(inAccount);
tbMember.setPaymentStatus(paymentStatus); if ("check".equals(checkOrRecord)){
tbMember.setPaymentStatus(paymentStatus);
}
tbMemberProjectSubitemMapper.updateById(tbMember); tbMemberProjectSubitemMapper.updateById(tbMember);
// 生成会员有效期 // 生成会员有效期
@@ -574,16 +585,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//更新主列表 //更新主列表
tbMemberCertificate.setPaidAmount(newPaidAmount); tbMemberCertificate.setPaidAmount(newPaidAmount);
tbMemberCertificate.setInAccount(inAccount); tbMemberCertificate.setInAccount(inAccount);
tbMemberCertificate.setPaymentStatus(paymentStatus); if ("check".equals(checkOrRecord)){
tbMemberCertificate.setPaymentStatus(paymentStatus);
}
certificatePaymentMapper.updateById(tbMemberCertificate); certificatePaymentMapper.updateById(tbMemberCertificate);
//拼装推到标协缴费的参数
// TbCheckVo tbCheckCerVo = new TbCheckVo();
// tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
// tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
//// tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark());
// typr6List.add(tbCheckCerVo);
break; break;
// 打包项目 // 打包项目
case PayIncomeContractCommon.PROJECT_TYPE8: case PayIncomeContractCommon.PROJECT_TYPE8: