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

Merge branch '未上传缴费都可以签到'

Browse Source
This commit is contained in:
lijiarao
2022-09-19 18:05:21 +08:00
parent 467bd989d8 bd41a0291f
commit 7eb86fad94
2 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+17 -16
View File
@@ -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)){
@@ -811,15 +811,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer payMode = meetingSituation.getPayMode();
//如果是汇款并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
signInPageVO.setCanCheckIn(0);
//if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
// && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
// signInPageVO.setCanCheckIn(0);
//如果是线上缴费并且缴费凭证为空
}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
signInPageVO.setCanCheckIn(0);
//}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
// && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
// signInPageVO.setCanCheckIn(0);
//}else
//如果是线上缴费并且审核不通过的
}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
signInPageVO.setCanCheckIn(0);
// 报名信息没有审核通过