update 现场缴费也可以签到

This commit is contained in:
lijiarao
2022-09-07 09:39:51 +08:00
parent ef6eabb5c7
commit 6371ba11e9
@@ -760,15 +760,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
//如果是线上缴费并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
throw new JeroBootException("请上传缴费凭证后再签到");
}
//if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
// && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
// throw new JeroBootException("请上传缴费凭证后再签到");
//}
//如果是线上缴费并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
throw new JeroBootException("请审核凭证通过后再签到");
}
//if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
// && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
// throw new JeroBootException("请审核凭证通过后再签到");
//}
//如果是汇款并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
@@ -782,7 +782,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
meetingSituation.setCheckInTime(new Date());
Integer registerProcess = meetingSituation.getRegisterProcess();
if (Objects.equals(registerProcess,3)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_8);
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
}else if (Objects.equals(registerProcess,6)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
}else if (Objects.equals(registerProcess,14)){