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

fix bug 41907 扫码签到--审核未通过不能签到

Browse Source
This commit is contained in:
lijiarao
2021-11-02 18:47:47 +08:00
parent b2e958044d
commit ba006873c3
1 changed files with 13 additions and 3 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
+13 -3
View File
@@ -670,7 +670,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//如果是线上缴费并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
&& !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
throw new JeroBootException("请审核通过后再签到");
throw new JeroBootException("请审核凭证通过后再签到");
}
//如果是汇款并且审核不通过的
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
&& !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
throw new JeroBootException("请审核报名信息通过后再签到");
}
meetingSituation.setCheckIn(PayProjectCommon.YES);
meetingSituation.setCheckFile(signInVO.getFileId());
@@ -695,9 +700,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
signInPageVO.setCompanyContactName(meetingSituation.getCompanyContactName());
signInPageVO.setCheckIn(meetingSituation.getCheckIn());
signInPageVO.setCheckFile(meetingSituation.getCheckFile());
//如果是汇款并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
//如果是汇款并且审核不通过的
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);
//如果是线上缴费并且审核不通过的