From 39942ec4cfa58405584084bb9d7384b70eecb854 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 12 Jul 2023 10:54:48 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/dto/SendMessageDTO.java   | 6 ++++++
 .../jero/common/service/impl/SendMessageServiceImpl.java    | 3 ++-
 .../jero/meeting/service/impl/PayMeetingServiceImpl.java    | 1 +
 .../main/java/com/jero/meeting/vo/PublishReminderVO.java    | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java
index 178f2fda..9a07328d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java
@@ -1,5 +1,6 @@
 package com.jero.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -53,4 +54,9 @@ public class SendMessageDTO implements Serializable {
      * 文件名集合(邮箱发送附件)
      */
     private List<String> listFile;
+    /**
+     * 是否发送邮件
+     */
+    @ApiModelProperty(value = "是否发送邮件")
+    private Integer sendEmailFlag;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
index 1e55f0c6..face320b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
@@ -104,8 +104,9 @@ public class SendMessageServiceImpl implements SendMessageService {
         // 1短信 2邮件 3系统
         // 发送邮件 true
         String fromUser = sendMessageDTO.getFromUser();
+        Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag();
         LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2)){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){
             if(StringUtils.isEmpty(sendMessageDTO.getEmail())){
                 throw new JeroBootException("邮件发送，邮箱地址不能为空！");
             }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index c4b209de..757e99d8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -724,6 +724,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 map.put("meetingType", meetingType);
                 map.put("meetingName", payMeeting.getMeetingName());
                 map.put("busId", meetingId);
+                sendMessageDTO.setSendEmailFlag(publishReminderVO.getSendEmailFlag());
                 sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
                 sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
                 sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java
index 5c831c2e..9dc9200d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java
@@ -21,4 +21,6 @@ public class PublishReminderVO {
     private List<String> subitemIds;
     @ApiModelProperty(value = "项目类型1:工作组，2：分标委")
     private Integer projectType;
+    @ApiModelProperty(value = "是否发送邮件")
+    private Integer sendEmailFlag;
 }