From fe53ac50431eae821f054ff759183625d02fd6d4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 12 Jul 2023 15:10:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84-=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayFileEmailRemindRecordService.java |  4 +++-
 ...ingGroupDistributionRecordServiceImpl.java | 21 ++++++++++++-------
 .../handle/impl/EmailSendMsgHandle.java       |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java
index 7dc5c722..802ad58d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java
@@ -2,6 +2,7 @@ package com.jero.data.service.impl;
 
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.data.entity.PayFileEmailRemindRecord;
@@ -14,7 +15,8 @@ import com.jero.data.mapper.PayFileEmailRemindRecordMapper;
 @Service
 public class PayFileEmailRemindRecordService extends ServiceImpl<PayFileEmailRemindRecordMapper, PayFileEmailRemindRecord> {
 
-    public void insertByFileList(List<String> fileIdList, String contactId) {
+    public void insertByFileList(String fileIds, String contactId) {
+        String[] fileIdList = fileIds.split(",");
         for (String fileId : fileIdList) {
             PayFileEmailRemindRecord payFileEmailRemindRecord = new PayFileEmailRemindRecord();
             payFileEmailRemindRecord.setFileId(fileId);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
index 40110a3a..77882f6c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
@@ -86,10 +86,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
     @Override
     @Transactional
     public List<String> add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
-        if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){
+        String contactsIds = payWorkingGroupDistributionRecord.getContactsIds();
+        if(StringUtils.isBlank(contactsIds)){
             throw new JeroBootException("成员id不能为空!");
         }
-        String[] s = payWorkingGroupDistributionRecord.getContactsIds().split(",");
+        String[] s = contactsIds.split(",");
         for (String s1 : s) {
             if(StringUtils.isBlank(s1)){
                 throw new JeroBootException("成员id不能为空!");
@@ -135,7 +136,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             msg = payWorkingGroup.getWorkingGroupProject();
         }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
             LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
-            queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
+            queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(",")));
             List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
             if(!CollectionUtils.isEmpty(listContacts)){
                 String str = JSON.toJSONString(listContacts);
@@ -167,7 +168,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             msg = payCaseCommittee.getName();
         }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE3){
             LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
-            queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
+            queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(",")));
             List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
             if(!CollectionUtils.isEmpty(listContacts)){
                 String str = JSON.toJSONString(listContacts);
@@ -219,6 +220,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
 
                 // 发送消息
                 SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag();
+                sendMessageDTO.setSendEmailFlag(sendEmailFlag);
                 if(!StringUtils.isBlank(p.getEmail())){
                     sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
                 }
@@ -241,6 +244,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 }
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
+                if (!CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)) {
+                    fileEmailRemindRecordService.insertByFileList(byId.getId(),p.getId());
+                }
             }catch (Exception e){
                 if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getName() + "邮件发送失败")){
                     listMsg.add(p.getCompanyName()+"-"+p.getName() + "邮件发送失败");
@@ -252,10 +258,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
 
     @Override
     public List<String> addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
-        if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){
+        String contactsIds = payWorkingGroupDistributionRecord.getContactsIds();
+        if(StringUtils.isBlank(contactsIds)){
             throw new JeroBootException("成员id不能为空!");
         }
-        String[] s = payWorkingGroupDistributionRecord.getContactsIds().split(",");
+        String[] s = contactsIds.split(",");
         for (String s1 : s) {
             if(StringUtils.isBlank(s1)){
                 throw new JeroBootException("成员id不能为空!");
@@ -438,7 +445,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 sendMessageDTO.setBusId(json.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
                 if (!CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)) {
-                    fileEmailRemindRecordService.insertByFileList(Arrays.asList(n),p.getContactId());
+                    fileEmailRemindRecordService.insertByFileList(dataIds,p.getId());
                 }
             }catch (Exception e){
                 if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getName() + "邮件发送失败")){
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java
index 3209d7a7..4f2bcfbe 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java
@@ -125,7 +125,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
 
         Properties javaMailProperties = mailSender.getJavaMailProperties();
         javaMailProperties.setProperty("mail.smtp.auth", "true");
-        javaMailProperties.setProperty("mail.debug", "true");//启用调试
+        //javaMailProperties.setProperty("mail.debug", "true");//启用调试
         javaMailProperties.setProperty("mail.smtp.timeout", "3000"); //设置超时时间3秒
         javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
         javaMailProperties.setProperty("mail.smtp.starttls.required", "true");