From a0484f590b9ab9418e80d6d595335f8355d84deb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 12 Jan 2022 20:14:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=A4=E6=96=AD=E6=94=B9=E4=B8=BA=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E7=9A=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

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<PayMeeting, IPayMeeting
             throw new JeroBootException("会议无此文件..");
         }
         BigDecimal meetingCosts = payMeeting.getMeetingCosts();
-        //非免费会议并且非成员
-        if (meetingCosts.compareTo(BigDecimal.ZERO) < 1 && !isSubItem){
-            QueryWrapper<PayMeetingSituation> 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<PayMeetingSituation> 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("会议报名并审核通过后才可查看文件");
             }
         }