From 7e34361da887703509ecf3623f6eec442e12bfa5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 15 Dec 2021 19:38:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=8A=A5=E5=90=8D=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81=E5=90=8E=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 5417aa2c..4a8bb0cf 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
@@ -267,13 +267,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
         if (payMeetingSituation1.getIsZero()) {
             payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
-            payMeetingSituation1.setRegisterProcess(12);
-        }else {
-            if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
-                payMeetingSituation1.setRegisterProcess(3);
-            }else {
-                payMeetingSituation1.setRegisterProcess(1);
-            }
         }
         payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
         payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
@@ -824,7 +817,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation.setPaymentRecord(paymentRecord);
         payMeetingSituation.setOrderCode(orderCode);
         payMeetingSituation.setCheckResult(0);
-        Integer registerProcess = payMeetingSituation.getRegisterProcess();
+        Integer registerProcess = payMeetingSituation1.getRegisterProcess();
         if (Objects.equals(registerProcess,3)){
             payMeetingSituation.setRegisterProcess(4);
         }else if (Objects.equals(registerProcess,8)){
@@ -1202,6 +1195,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
         }
+        if (payMeetingSituation1.getIsZero()) {
+            payMeetingSituation1.setRegisterProcess(12);
+        }else {
+            if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+                payMeetingSituation1.setRegisterProcess(3);
+            }else {
+                payMeetingSituation1.setRegisterProcess(1);
+            }
+        }
         return payMeetingSituation1;
     }