From 1c15c43a5eb7d9247288c73ec6d8ce12fc366f9f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 20 Oct 2021 15:24:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041078=20=E6=88=91=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF--=E7=AE=A1=E7=90=86=E7=AB=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA--=E6=88=91=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=94=B6=E4=B8=8D=E5=88=B0=E9=80=9A=E7=9F=A5=EF=BC=8C?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=92=8C=E7=9F=AD=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java     | 16 ++++++++++++----
 1 file changed, 12 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 2db19b91..dfdc8e52 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
@@ -166,6 +166,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
         //处理打包情况
         //handlePack(payMeetingSituation1);
+        signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
     }
 
     /**
@@ -282,7 +283,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         saveMeetingSituation(payMeetingSituation1);
         //处理打包
         //handlePack(payMeetingSituation1);
-        Integer identity = payMeetingSituation1.getIdentity();
+        signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
+        //上传付款凭证发送邮件提醒审批
+        //SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
+    }
+
+    /**
+     * 添加参会人或报名时，判断是否发送消息
+     */
+    private void signUpSendMessage(PayMeetingSituation payMeetingSituation, PayMeeting payMeeting, PayMeetingSituation payMeetingSituation1) {
+        Integer meetingType = payMeeting.getMeetingType();
         //判断是否发送消息，工作组和分标委特殊处理
         if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))
                 || meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
@@ -295,13 +305,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //汇款或线上缴费
             if (payModeBoolean) {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
-                //汇款或线上缴费
+                //不是汇款或线上缴费
             }else {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
             }
         }
-        //上传付款凭证发送邮件提醒审批
-        //SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
     }
 
     /**