From 42f9a8cd6453d7471ed7aa1e4cd4241a36d668e4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 1 Aug 2023 14:23:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AB=AF=E4=BC=9A=E8=AE=AE=E4=B8=8B=E8=BD=BD=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E9=82=AE=E4=BB=B6=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupDataFileServiceImpl.java   | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java
index 6acea41c..4cb47146 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDataFileServiceImpl.java
@@ -76,19 +76,24 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl<PayWorkingGr
             throw new JeroBootException("用户不存在!");
         }
         // 验证文件是否为会议
-        //LambdaQueryWrapper<PayMeeting> queryPayMeeting = new LambdaQueryWrapper<>();
-        //queryPayMeeting.like(PayMeeting::getMeetingData,fileId);
-        //List<PayMeeting> listPayMeeting = payMeetingService.list(queryPayMeeting);
-        // 验证会议文件下载次数是否达到上线
-        //if(!CollectionUtils.isEmpty(listPayMeeting)){
-        //    LambdaQueryWrapper<PayFileDownloadRecord> queryPayFileDownloadRecord = new LambdaQueryWrapper<>();
-        //    queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getUserId,userId);
-        //    queryPayFileDownloadRecord.eq(PayFileDownloadRecord::getFileId,fileId);
-        //    int count = payFileDownloadRecordService.count(queryPayFileDownloadRecord);
-        //    if(count >= PayProjectCommon.DOWNLOAD_COUNT){
-        //        throw new JeroBootException("文件下载次数已达上线!");
-        //    }
-        //}
+        EmailSendMsgHandle emailHandle = null;
+        LambdaQueryWrapper<PayMeeting> queryPayMeeting = new LambdaQueryWrapper<>();
+        queryPayMeeting.like(PayMeeting::getMeetingData,fileId);
+        List<PayMeeting> listPayMeeting = payMeetingService.list(queryPayMeeting);
+        String content = "";
+        for (PayMeeting meeting : listPayMeeting) {
+            String directorId = meeting.getDirectorId();
+            LoginUser loginUser = sysBaseAPI.getUserById(directorId);
+            String fromEmail = loginUser.getEmail();
+            String fromEmailPassword = loginUser.getEmailPassword();
+            if (StringUtils.isNotBlank(fromEmail) && StringUtils.isNotBlank(fromEmailPassword)){
+                String fromEmailNew = PasswordUtil.decrypt(fromEmail);
+                String fromEmailPasswordNew = PasswordUtil.decrypt(fromEmailPassword);
+                emailHandle = new EmailSendMsgHandle(fromEmailNew,fromEmailPasswordNew);
+            }
+            content = meeting.getMeetingName();
+        }
+
         OSSFile byId = iossFileService.getById(fileId);
         if(Objects.isNull(byId)){
             throw new JeroBootException("没有找到文件!");
@@ -102,15 +107,17 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl<PayWorkingGr
             throw new JeroBootException("用户邮箱不能为空!");
         }
         try {
-            // 发送人为管理员
-            LoginUser loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser"));
-            String fromEmail = loginUser.getEmail();
-            String fromEmailPassword = loginUser.getEmailPassword();
-            String fromEmailNew = PasswordUtil.decrypt(fromEmail);
-            String fromEmailPasswordNew = PasswordUtil.decrypt(fromEmailPassword);
-            EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(fromEmailNew,fromEmailPasswordNew);
+            if (emailHandle == null){
+                // 发送人为管理员
+                LoginUser loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser"));
+                String fromEmail = loginUser.getEmail();
+                String fromEmailPassword = loginUser.getEmailPassword();
+                String fromEmailNew = PasswordUtil.decrypt(fromEmail);
+                String fromEmailPasswordNew = PasswordUtil.decrypt(fromEmailPassword);
+                emailHandle = new EmailSendMsgHandle(fromEmailNew,fromEmailPasswordNew);
+            }
             String email = PasswordUtil.decrypt(payContactsManagement.getEmail());
-            emailHandle.SendMsgAndFile(email,"资料","文件",listFile);
+            emailHandle.SendMsgAndFile(email,"会议资料",content+"文件",listFile);
         }catch (Exception e){
             log.error("邮件发送异常",e);
             throw new JeroBootException("邮件发送失败!");