From e1388434c0bfe3e77bd9ff05a11db6ce648f2d33 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 12 Oct 2021 10:26:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=20?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=92=8C=E8=8E=B7=E5=8F=96=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 33 +++++++++++++++----
 .../com/jero/meeting/vo/SignInPageVO.java     |  5 +++
 2 files changed, 31 insertions(+), 7 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 b98f4422..b8b2bcf2 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
@@ -551,11 +551,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (payMeeting == null) {
             throw new JeroBootException("会议不存在");
         }
-        Date startTime = payMeeting.getStartSignInTime() != null ? payMeeting.getStartSignInTime() : payMeeting.getStartTime();
+        /*Date startTime = payMeeting.getStartSignInTime() != null ? payMeeting.getStartSignInTime() : payMeeting.getStartTime();
         Date endTime = payMeeting.getEndSignInTime() != null ? payMeeting.getEndSignInTime() : payMeeting.getEndTime();
         if (!belongCalendar(new Date(), startTime, endTime)) {
             throw new JeroBootException("不在会议可签到时间内,无法签到");
-        }
+        }*/
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (loginUser == null) {
             throw new JeroBootException("参会人不存在");
@@ -569,17 +569,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (meetingSituation == null) {
             throw new JeroBootException("很抱歉，未查询到您的报名信息");
         }
-        //如果是线上缴费并且缴费凭证为空
-        Integer payMode = meetingSituation.getPayMode();
-        if (Objects.equals(payMode, 2) && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
-            throw new JeroBootException("请上传缴费凭证后再签到");
 
-        }
         if (StringUtils.isNotBlank(signInVO.getFileId())) {
             Integer checkIn = meetingSituation.getCheckIn();
             if (checkIn.equals(PayProjectCommon.YES)) {
                 throw new JeroBootException("已经签到，请勿重复签到");
             }
+            //如果是汇款并且缴费凭证为空
+            Integer payMode = meetingSituation.getPayMode();
+            if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
+                    && 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("请审核通过后再签到");
+            }
             meetingSituation.setCheckIn(PayProjectCommon.YES);
             meetingSituation.setCheckFile(signInVO.getFileId());
             saveOrUpdate(meetingSituation);
@@ -601,6 +607,19 @@ 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_1)
+                && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
+            signInPageVO.setCanCheckIn(0);
+        }
+        //如果是线上缴费并且审核不通过的
+        else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
+                && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+            signInPageVO.setCanCheckIn(0);
+        }else {
+            signInPageVO.setCanCheckIn(1);
+        }
         return signInPageVO;
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInPageVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInPageVO.java
index f26d9056..e7228941 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInPageVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInPageVO.java
@@ -65,6 +65,11 @@ public class SignInPageVO {
     @Dict(dicCode = "yn")
     private Integer checkIn;
 
+    /**是否可以签到*/
+    @ApiModelProperty(value = "是否可以签到")
+    @Dict(dicCode = "yn")
+    private Integer canCheckIn;
+
     /**签到文件*/
     @ApiModelProperty(value = "签到文件")
     private String checkFile;