fix 74131 会议提醒不发送邮件时不变更提醒状态
This commit is contained in:
+10
-6
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.jero.common.constant.CommonConstant;
|
||||||
import com.jero.common.dto.SendMessageDTO;
|
import com.jero.common.dto.SendMessageDTO;
|
||||||
import com.jero.common.enums.CompanyMessageEnums;
|
import com.jero.common.enums.CompanyMessageEnums;
|
||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
@@ -744,7 +745,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
map.put("meetingType", meetingType);
|
map.put("meetingType", meetingType);
|
||||||
map.put("meetingName", payMeeting.getMeetingName());
|
map.put("meetingName", payMeeting.getMeetingName());
|
||||||
map.put("busId", meetingId);
|
map.put("busId", meetingId);
|
||||||
sendMessageDTO.setSendEmailFlag(publishReminderVO.getSendEmailFlag());
|
Integer sendEmailFlag = publishReminderVO.getSendEmailFlag();
|
||||||
|
sendMessageDTO.setSendEmailFlag(sendEmailFlag);
|
||||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
|
sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
|
||||||
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
|
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
|
||||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
|
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
|
||||||
@@ -758,11 +760,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
sendMessageDTO.setBusId(jsonObject.toJSONString());
|
sendMessageDTO.setBusId(jsonObject.toJSONString());
|
||||||
try {
|
try {
|
||||||
sendMessageService.SendMessageService(sendMessageDTO);
|
sendMessageService.SendMessageService(sendMessageDTO);
|
||||||
PayMeetingRemindRecord meetingRemindRecord1 = new PayMeetingRemindRecord();
|
if (!CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){
|
||||||
meetingRemindRecord1.setSubitemId(meetingRemindRecord.getSubitemId());
|
PayMeetingRemindRecord meetingRemindRecord1 = new PayMeetingRemindRecord();
|
||||||
meetingRemindRecord1.setContactId(meetingRemindRecord.getContactId());
|
meetingRemindRecord1.setSubitemId(meetingRemindRecord.getSubitemId());
|
||||||
meetingRemindRecord1.setMeetingId(meetingId);
|
meetingRemindRecord1.setContactId(meetingRemindRecord.getContactId());
|
||||||
payMeetingRemindRecordService.save(meetingRemindRecord1);
|
meetingRemindRecord1.setMeetingId(meetingId);
|
||||||
|
payMeetingRemindRecordService.save(meetingRemindRecord1);
|
||||||
|
}
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
String name = payContactsManagement.getName();
|
String name = payContactsManagement.getName();
|
||||||
if(e.getMessage().contains("邮件发送") && !listMsg.contains(name + "邮件发送失败")){
|
if(e.getMessage().contains("邮件发送") && !listMsg.contains(name + "邮件发送失败")){
|
||||||
|
|||||||
Reference in New Issue
Block a user