From ba006873c31921d962bc175a56ee0438fbe7b29f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 2 Nov 2021 18:47:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041907=20=E6=89=AB=E7=A0=81=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0--=E5=AE=A1=E6=A0=B8=E6=9C=AA=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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 cb64cfcd..1c9b74d6 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
@@ -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);
         //如果是线上缴费并且审核不通过的