From 87aecee5e13d89fa1fed53811159f47b1046c5ee Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 5 Nov 2021 11:56:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E6=8A=A5=E5=90=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B2=A1=E6=9C=89=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 3599d228..86fa2b4e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -677,6 +677,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
                 throw new JeroBootException("请审核报名信息通过后再签到");
             }
+            if (!Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+                throw new JeroBootException("请审核报名信息通过后再签到");
+            }
             meetingSituation.setCheckIn(PayProjectCommon.YES);
             meetingSituation.setCheckFile(signInVO.getFileId());
             meetingSituation.setCheckInTime(new Date());
@@ -714,6 +717,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
                 && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
             signInPageVO.setCanCheckIn(0);
+        //    报名信息没有审核通过
+        }else if (!Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+            signInPageVO.setCanCheckIn(0);
         }else {
             signInPageVO.setCanCheckIn(1);
         }