From b4f4bc9c5d97b77cab4882c59a41a0160df6033f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 14 Oct 2021 18:11:17 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=9C=80=E8=A6=81=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=B1=87=E6=AC=BE=E5=87=AD=E8=AF=81/=E5=90=8E=E5=9B=9B?=
 =?UTF-8?q?=E4=BD=8D=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B9=9F=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 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 042e73e8..c0c7c666 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
@@ -291,14 +291,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             judgeSend(payMeeting, payMeetingSituation1, isSubItem);
         } else {
             Integer payMode = payMeetingSituation.getPayMode();
-            //不是汇款和线上缴费
-            boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
+            boolean payModeBoolean = Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
+            //汇款或线上缴费
             if (payModeBoolean) {
+                sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
+                //汇款或线上缴费
+            }else {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
             }
         }
         //上传付款凭证发送邮件提醒审批
-        SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
+        //SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
     }
 
     /**
@@ -308,17 +311,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
      */
     private void judgeSend(PayMeeting payMeeting, PayMeetingSituation payMeetingSituation, boolean isSubItem) {
         Integer payMode = payMeetingSituation.getPayMode();
-        //不是汇款和线上缴费
-        boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
+        //汇款或线上缴费
+        boolean payModeBoolean = Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
         //工作组成员
         if (isSubItem) {
-            //不是汇款和线上缴费
-            if (payModeBoolean) {
+            //不是汇款或线上缴费
+            if (!payModeBoolean) {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
             }
         } else {
-            //不是汇款和线上缴费
-            if (payModeBoolean) {
+            //不是汇款或线上缴费
+            if (!payModeBoolean) {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG2, "C_OPEN_TYPE2");
             } else {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");