diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index f2d1165d..45e6883d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -499,19 +499,24 @@ public class PayMeetingController extends JeroController queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("meeting_id", meetingId); - queryWrapper1.eq("company_contact_id", sysUserId); - PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(queryWrapper1); - if (ObjectUtils.isEmpty(meetingSituation)) { - throw new JeroBootException("未报名会议。"); - } - Integer checkResult = meetingSituation.getCheckResult(); - Integer registerCheckResult = meetingSituation.getRegisterCheckResult(); - if (!Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1) - || !Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) { + //先判断会议金额是否大于0 + if (meetingCosts.compareTo(BigDecimal.ZERO) > 0){ + //在判断成员是否报名通过 + if (isSubItem){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("meeting_id", meetingId); + queryWrapper1.eq("company_contact_id", sysUserId); + PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(queryWrapper1); + if (ObjectUtils.isEmpty(meetingSituation)) { + throw new JeroBootException("未报名会议。"); + } + Integer checkResult = meetingSituation.getCheckResult(); + Integer registerCheckResult = meetingSituation.getRegisterCheckResult(); + if (!Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1) + || !Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) { + throw new JeroBootException("会议报名并审核通过后才可查看文件"); + } + }else { throw new JeroBootException("会议报名并审核通过后才可查看文件"); } }