From 5ee7cadd4c87660ce62c71cd949042f0d22fc0bb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Jul 2022 11:48:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?udpate=20=E5=AE=A1=E6=A0=B8=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E7=BC=B4=E8=B4=B9=E6=97=B6=EF=BC=8C=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E5=87=AD=E8=AF=81=E4=B8=BA=E7=A9=BA=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 e35e85e8..540b43a7 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
@@ -482,10 +482,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (!registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
             throw new JeroBootException("报名信息未审核通过");
         }
-        String paymentRecord = payMeetingSituation.getPaymentRecord();
-        if (StrUtil.isBlank(paymentRecord)) {
-            throw new JeroBootException("缴费凭证为空不能审核");
-        }
+        //String paymentRecord = payMeetingSituation.getPaymentRecord();
+        //if (StrUtil.isBlank(paymentRecord)) {
+        //    throw new JeroBootException("缴费凭证为空不能审核");
+        //}
         Integer oldCheckResult = payMeetingSituation.getCheckResult();
         if (oldCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
             throw new JeroBootException("审核通过之后就无法在审核");

From 96c1c000bd11da2e447e75844b29a6393489a770 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Jul 2022 15:16:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?udpate=20=E5=AE=A1=E6=A0=B8=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E7=BC=B4=E8=B4=B9=E5=90=8E=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=89=8D=E6=8A=A5=E5=90=8D=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 540b43a7..375a6d94 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
@@ -510,9 +510,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //payMeetingSituation.setInAccount(PayProjectCommon.YES);
             //设置实收金额
             //payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
-            if (Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
+            if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
-            }else if (Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
+            }else if (Objects.equals(registerProcess,8)||Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
             }
             payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());

From 29da3a047a206507263b36f4136b5461a489896c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Jul 2022 15:18:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?udpate=20=E5=AE=A1=E6=A0=B8=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E7=BC=B4=E8=B4=B9=EF=BC=8C=E6=8F=90=E5=89=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=A0=E6=B3=95=E9=A9=B3=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java  | 4 ++++
 1 file changed, 4 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 375a6d94..a57561d9 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
@@ -496,6 +496,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         Integer registerProcess = payMeetingSituation.getRegisterProcess();
         if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
             payMeetingSituation.setCheckRemark(checkRemark);
+
+            if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,8)){
+                throw new JeroBootException("提前审核无法驳回");
+            }
             if (Objects.equals(registerProcess,4)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
             }else if (Objects.equals(registerProcess,9)){