From 5372f5b8c40c2d0f5ce1f189d1361a3602270780 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Oct 2021 19:03:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041748=20=E6=88=91=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84/=E5=88=86=E6=A0=87?=
 =?UTF-8?q?=E5=A7=94=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E6=B1=87=E6=AC=BE?=
 =?UTF-8?q?=E6=88=96=E7=BA=BF=E4=B8=8A=E7=BC=B4=E8=B4=B9=E6=94=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=B6=88=E6=81=AF=20fix=20bug=2041754=20=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E4=BA=BA=E4=BF=AE=E6=94=B9=E5=8F=82=E4=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E6=B2=A1=E5=81=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9B=B4=E6=8E=A5=E7=A1=AE=E5=AE=9A=EF=BC=8C=E6=8A=A5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java | 12 ++++++++++--
 1 file changed, 10 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 87920ade..a1787950 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
@@ -352,6 +352,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //不是汇款或线上缴费
             if (!payModeBoolean) {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
+            }else {
+                sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
             }
         } else {
             //不是汇款或线上缴费
@@ -847,7 +849,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //要保存的对象
         PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
         payMeetingSituation1.setAmountReceivable(new BigDecimal("0"));
-        payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
+        if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
+                &&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
+            payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
+        }
         //会议校验基础类
         MeetingEntity meetingEntity = new MeetingEntity();
         BeanUtils.copyProperties(payMeetingSituation, meetingEntity);
@@ -966,7 +971,10 @@ 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)) {
+                    payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+                }
                 payMeetingSituation1.setOrderCode(orderCode);
                 payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());