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

fix bug 40606 分标委-会议维护-发布时。报：请输入有效内容【阻塞】

Browse Source
This commit is contained in:
lijiarao
2021-10-14 12:00:32 +08:00
parent 787a55dde2
commit 865918dcae
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java
+4
View File
@@ -41,6 +41,10 @@ public class SendMessageDTO implements Serializable {
* 模板编码 * 模板编码
*/ */
private String templateCode; private String templateCode;
/**
* 是否使用模板
*/
private Boolean useTemplate;
/** /**
* 模板参数 * 模板参数
*/ */
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+19 -16
View File
@@ -73,23 +73,26 @@ public class SendMessageServiceImpl implements SendMessageService {
//模板内容 //模板内容
String content = sysSmsTemplate.getTemplateContent(); String content = sysSmsTemplate.getTemplateContent();
HashMap<String,String> map = sendMessageDTO.getTemplateParam(); HashMap<String,String> map = sendMessageDTO.getTemplateParam();
if(!Objects.isNull(map)) { if (Objects.equals(sendMessageDTO.getUseTemplate(),false)){
// 替换企业端系统url与小程序名称 content = map.get("value");
// todo 替换系统地址，小程序名称 }else {
if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) if(!Objects.isNull(map)) {
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) // 替换企业端系统url与小程序名称
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) // todo 替换系统地址，小程序名称
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
map.put("systemAddress",env.getProperty("message.systemUrl")); || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
map.put("wxName",env.getProperty("message.wxName")); || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){
map.put("systemAddress",env.getProperty("message.systemUrl"));
map.put("wxName",env.getProperty("message.wxName"));
}
for (Map.Entry<String, String> entry : map.entrySet()) {
String str = "${" + entry.getKey() + "}";
content = content.replace(str, entry.getValue());
}
} }
for (Map.Entry<String, String> entry : map.entrySet()) {
String str = "${" + entry.getKey() + "}";
content = content.replace(str, entry.getValue());
}
} }
// 1短信 2邮件 3系统 // 1短信 2邮件 3系统
// 发送邮件 true // 发送邮件 true
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+10 -12
View File
@@ -453,19 +453,17 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
String email = payContactsManagement.getEmail(); String email = payContactsManagement.getEmail();
String phone = payContactsManagement.getPhone(); String phone = payContactsManagement.getPhone();
SendMessageDTO sendMessageDTO = new SendMessageDTO(); SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(email)) {
if (StringUtils.isNotBlank(payMeeting.getNotice())){
sysBaseApi.sendEmailMsg(PasswordUtil.decrypt(email),"会议通知",payMeeting.getNotice());
}else {
sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
}
}
if (!StringUtils.isBlank(phone)) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
}
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("meetingName",payMeeting.getMeetingName()); if (StringUtils.isNotBlank(payMeeting.getNotice())){
sendMessageDTO.setUseTemplate(false);
map.put("value",payMeeting.getNotice());
}else {
map.put("meetingName",payMeeting.getMeetingName());
}
sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
sendMessageDTO.setFromUser(director.getUsername()); sendMessageDTO.setFromUser(director.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode()); sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode());
sendMessageDTO.setTemplateParam(map); sendMessageDTO.setTemplateParam(map);