From 513d6d7840b9ef6416954f551778189a75b596e2 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 6 Aug 2024 18:01:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=2088100=20=E4=BC=81=E4=B8=9A=E7=AB=AF--?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=90=8E=E7=BC=96=E8=BE=91=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F--=E5=A4=96=E5=B1=82=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E7=8A=B6=E6=80=81=E5=92=8C=E6=8C=89=E9=92=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 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 82b4d7f0..9fdb2846 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
@@ -1329,8 +1329,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 }
             }
             payMeetingSituation1.setPaymentRecord(paymentRecord);
-            if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
-                    &&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
+            Integer checkResult = payMeetingSituation.getCheckResult();
+            if (!Objects.equals(checkResult,MeetingSubitemCommon.SIGNUP_STATUS_1)
+                    &&!Objects.equals(checkResult,MeetingSubitemCommon.SIGNUP_STATUS_2)) {
+                payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+            }
+            //参会人由打包编辑为来款时处理
+            if (Objects.equals(checkResult,MeetingSubitemCommon.SIGNUP_STATUS_1)
+                    && paymentRecord == null) {
                 payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
             payMeetingSituation1.setOrderCode(orderCode);