来款审核
This commit is contained in:
baozhipeng
+31
-36
@@ -296,9 +296,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
payCommonProjectMapper.updateById(payCommonProject);
|
||||
|
||||
PayCommonProject oldPayCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
|
||||
//发消息参数
|
||||
principalId = payCommonProject.getPrincipalId();
|
||||
project=payCommonProject.getChargeProject();
|
||||
principalId = oldPayCommonProject.getPrincipalId();
|
||||
project=oldPayCommonProject.getChargeProject();
|
||||
break;
|
||||
// 工作组项目
|
||||
case PayIncomeContractCommon.PROJECT_TYPE2:
|
||||
@@ -306,15 +307,16 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
|
||||
|
||||
PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
|
||||
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
|
||||
|
||||
payWorking.setId(payPaymentRecord.getProjectId());
|
||||
payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
payWorkingGroupSubItemMapper.updateById(payWorking);
|
||||
|
||||
PayWorkingGroupSubItem oldPayWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
|
||||
PayWorkingGroup oldPayWorkingGroup = payWorkingGroupService.getById(oldPayWorking.getWorkingGroupId());
|
||||
|
||||
//发消息参数
|
||||
principalId = payWorkingGroup.getPrincipalIdA();
|
||||
project = payWorkingGroup.getWorkingGroupProject();
|
||||
principalId = oldPayWorkingGroup.getPrincipalIdA();
|
||||
project = oldPayWorkingGroup.getWorkingGroupProject();
|
||||
break;
|
||||
//会员项目
|
||||
case PayIncomeContractCommon.PROJECT_TYPE4:
|
||||
@@ -322,30 +324,28 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
|
||||
|
||||
PayMemberProjectSubitem member = new PayMemberProjectSubitem();
|
||||
PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
|
||||
|
||||
member.setId(payPaymentRecord.getProjectId());
|
||||
member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
payMemberProjectSubitemMapper.updateById(member);
|
||||
|
||||
PayMemberProjectSubitem oldMember = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
|
||||
PayMemberProject oldPayMemberProject = memberProjectService.getById(oldMember.getProjectId());
|
||||
//发消息参数
|
||||
principalId = payMemberProject.getDirectorId();
|
||||
project = payMemberProject.getProjectName();
|
||||
principalId = oldPayMemberProject.getDirectorId();
|
||||
project = oldPayMemberProject.getProjectName();
|
||||
break;
|
||||
default:break;
|
||||
}
|
||||
|
||||
//新增子表
|
||||
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
||||
payPaymentRecord.setApplicantName(sysUser.getRealname());
|
||||
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
// payPaymentRecordMapper.updateById(payPaymentRecord);
|
||||
|
||||
//新增子表
|
||||
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
|
||||
payPaymentRecord.setCreateBy(sysUser.getUsername());
|
||||
payPaymentRecord.setCreateTime(new Date());
|
||||
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
|
||||
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
|
||||
|
||||
payPaymentRecordSub.setId(null);
|
||||
payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
|
||||
payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
|
||||
@@ -405,7 +405,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
* @Description 汇款凭证审核不通过 审核人 给申请人发送消息
|
||||
* @Date 2021/12/16 11:34
|
||||
* @param phone 企业端用户手机号
|
||||
* @param projectId 负责人id
|
||||
* @param projectId 项目id
|
||||
* @param projectName 项目名称
|
||||
* @param projectType 项目类型
|
||||
* @return void
|
||||
@@ -460,11 +460,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
case PayIncomeContractCommon.PROJECT_TYPE1:
|
||||
PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
|
||||
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payCommonProject.getPaymentStatus())){
|
||||
throw new JeroBootException("只有待审核的才可以审核");
|
||||
}
|
||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||
//已同意
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payCommonProject.getPaymentStatus())){
|
||||
throw new JeroBootException("普通项目只有缴费凭证状态为“待审核”才可以同意");
|
||||
}
|
||||
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
|
||||
payPaymentRecords.add(payPaymentRecord);
|
||||
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2);
|
||||
@@ -474,9 +474,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
//更新主列表
|
||||
payCommonProjectMapper.updateById(payCommonProject);
|
||||
//发消息
|
||||
principalId = payCommonProject.getPrincipalId();
|
||||
project = payCommonProject.getChargeProject();
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -485,12 +484,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
|
||||
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
|
||||
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payWorking.getPaymentStatus())){
|
||||
throw new JeroBootException("只有待审核的才可以审核");
|
||||
}
|
||||
|
||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||
//已同意
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payWorking.getPaymentStatus())){
|
||||
throw new JeroBootException("工作组项目只有缴费凭证状态为“待审核”才可以同意");
|
||||
}
|
||||
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
|
||||
payPaymentRecords.add(payPaymentRecord);
|
||||
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2);
|
||||
@@ -500,9 +498,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
//更新主列表
|
||||
payWorkingGroupSubItemMapper.updateById(payWorking);
|
||||
//发消息
|
||||
principalId = payWorkingGroup.getPrincipalIdA();
|
||||
project = payWorkingGroup.getWorkingGroupProject();
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -511,12 +508,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
|
||||
PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
|
||||
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(member.getPaymentStatus())){
|
||||
throw new JeroBootException("只有待审核的才可以审核");
|
||||
}
|
||||
|
||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||
//已同意
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(member.getPaymentStatus())){
|
||||
throw new JeroBootException("会员项目只有缴费凭证状态为“待审核”才可以同意");
|
||||
}
|
||||
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
|
||||
payPaymentRecords.add(payPaymentRecord);
|
||||
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2);
|
||||
@@ -526,9 +522,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
//更新主列表
|
||||
payMemberProjectSubitemMapper.updateById(member);
|
||||
//发消息
|
||||
principalId = payMemberProject.getDirectorId();
|
||||
project = payMemberProject.getProjectName();
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(),payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -538,7 +533,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMember.getProjectId());
|
||||
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMember.getPaymentStatus())){
|
||||
throw new JeroBootException("只有待审核的才可以审核");
|
||||
throw new JeroBootException("标协会员只有只有缴费凭证状态为“待审核”才可以审核");
|
||||
}
|
||||
|
||||
//发消息参数
|
||||
@@ -576,7 +571,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
tbMember.setPaymentStatus(paymentStatus);
|
||||
tbCheckVo.setCheckResult(PayProjectCommon.NO);
|
||||
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
}
|
||||
|
||||
//更新主列表
|
||||
@@ -596,7 +591,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
TbMemberProject tbMemberProjectCertificate = tbMemberProjectService.getById(tbMemberCertificate.getProjectId());
|
||||
|
||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMemberCertificate.getPaymentStatus())){
|
||||
throw new JeroBootException("只有待审核的才可以审核");
|
||||
throw new JeroBootException("标协证书只有只有缴费凭证状态为“待审核”才可以审核");
|
||||
}
|
||||
//发消息参数
|
||||
principalId = tbMemberProjectCertificate.getDirectorId();
|
||||
@@ -634,7 +629,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
tbMemberCertificate.setPaymentStatus(paymentStatus);
|
||||
tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
|
||||
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||
}
|
||||
|
||||
//更新主列表
|
||||
|
||||
Reference in New Issue
Block a user