From 609060fd4c64375749898c3c02dfeb4cc00a03f4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 2 Nov 2021 15:11:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041414=20=E6=8A=A5=E5=90=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AE=A1=E6=A0=B8=E4=B8=8D=E9=80=9A=E8=BF=87=E5=90=8E?=
 =?UTF-8?q?,=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=E5=8D=B4=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=E6=88=90=E5=8A=9F=E4=BA=86,?=
 =?UTF-8?q?=E8=AF=B7=E7=A1=AE=E8=AE=A4=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/meeting/entity/PayMeeting.java      | 3 +++
 .../main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml | 2 ++
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index 65e19a1b..3853453d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -288,4 +288,7 @@ public class PayMeeting implements Serializable {
      */
     @TableField(exist = false)
     private Integer meetingSignUpType;
+
+    @TableField(exist = false)
+    private Integer registerCheckResult;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index 50366add..8eea009f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -33,6 +33,7 @@
         <result column="remark" property="remark"/>
         <result column="pay_mode" property="payMode"/>
         <result column="meetingStatus" property="meetingStatus"/>
+        <result column="register_check_result" property="registerCheckResult"/>
     </resultMap>
     <!--  将原有id改为会议id, 新增situationId 为成员id  -->
     <select id="pageListContract" resultMap="PayMeetingResultMap">
@@ -71,6 +72,7 @@
                case_committee_name,
                notice,
                pms.pay_mode,
+                pms.register_check_result,
                pms.id as situationId,
                pm.id,
                (case
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 8fcf0f5d..b60d1cc1 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
@@ -710,6 +710,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (!Objects.equals(payMeetingSituation1.getCompanyContactId(), loginUserId)) {
             throw new JeroBootException("不是参会人无法上传缴费凭证");
         }
+        if (!Objects.equals(payMeetingSituation1.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) {
+            throw new JeroBootException("报名信息未审核通过，无法上传缴费凭证");
+        }
         String paymentRecord = payMeetingSituationVO.getPaymentRecord();
         String orderCode = payMeetingSituationVO.getOrderCode();
         PayMeetingSituation payMeetingSituation = new PayMeetingSituation();