From aeaef6cab36b316f6dcec0eaaf39901e3d175f75 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 21 Oct 2021 16:42:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041188=20=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF#1-=E5=90=88=E5=90=8C=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA=E5=BB=BA=E7=AB=8B=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=B6=88=E6=81=AF=E4=B8=AD=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E6=98=BE=E7=A4=BA=E6=88=90=E4=BA=86null?=
 =?UTF-8?q?=EF=BC=8C=E9=82=AE=E4=BB=B6=E4=B9=9F=E6=9C=89=E5=90=8C=E6=A0=B7?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 da7e5e25..60a058b1 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
@@ -122,7 +122,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     @Override
     public void add(PayMeetingSituation payMeetingSituation) {
         payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
-        payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
+        //payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
         payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
         //处理校验参会人信息
         PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
@@ -132,12 +132,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         // 收入合同创建项目发送消息到项目负责人
         if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
             PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
-            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(), payMeetingSituation.getId(), payMeeting.getDirectorId());
+            contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation1.getCompanyContactName(), payMeetingSituation1.getId(), payMeeting.getDirectorId());
         }
         String meetingId = payMeetingSituation1.getMeetingId();
         PayMeeting payMeeting = meetingService.getById(meetingId);
         //上传付款凭证发送邮件提醒审批
-        SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
+        //SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
 
         //如果合同id存在则关联参会人到合同
         String contractId = payMeetingSituation.getContractId();
@@ -167,9 +167,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //处理打包情况
         //handlePack(payMeetingSituation1);
         //如果关联合同就不发消息
-        if (StringUtils.isBlank(payMeetingSituation1.getContractId())) {
+        if (!Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
             signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);    
-        } 
+        }
     }
 
     /**