LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 工作组-其他分发资料增加是否发送邮件参数

Browse Source
This commit is contained in:
lijiarao
2023-07-12 15:10:49 +08:00
parent 0bcd7458ca
commit fe53ac5043
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayFileEmailRemindRecordService.java
+3 -1
View File
@@ -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);
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+14 -7
View File
@@ -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() + "邮件发送失败")){
jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java
+1 -1
View File
@@ -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");