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

消息修改

Browse Source
This commit is contained in:
梁琦涛
2021-10-09 19:03:55 +08:00
parent fda60b8259
commit 138b3257ad
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
+2 -2
View File
@@ -29,8 +29,8 @@ public enum MessageUrlEnums {
C_OPEN_TYPE5("C_OPEN_TYPE5","component","MessagePage/UploadMeetingCertificateModal"),
C_OPEN_TYPE6("C_OPEN_TYPE6","component","MessagePage/MeetingDetailModal"),
C_OPEN_TYPE7("C_OPEN_TYPE7","component","MessagePage/MeetingDetailModal"),
C_OPEN_TYPE8("C_OPEN_TYPE8","none",""),
C_OPEN_TYPE9("C_OPEN_TYPE9","",""),
C_OPEN_TYPE8("C_OPEN_TYPE8","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
C_OPEN_TYPE10("C_OPEN_TYPE10","",""),
C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java
+6
View File
@@ -89,4 +89,10 @@ public class PayWorkingGroupDistributionRecord implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "联系人ids 多个以逗号分隔")
private java.lang.String contactsIds;
/**
* 联系人临时id
*/
@TableField(exist = false)
@ApiModelProperty(value = "联系人临时id")
private String temporaryContactsId;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+31 -4
View File
@@ -2,6 +2,7 @@ package com.jero.project.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -162,14 +163,19 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String finalMsg = msg;
list.forEach(p->{
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->Objects.equals(item.getTemporaryContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
return;
}
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(p.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
if(!StringUtils.isEmpty(p.getPhone())){
sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone()));
sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
map.put("workGroupName", finalMsg);
@@ -178,6 +184,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setListFile(listFile);
sendMessageDTO.setBusType("C_OPEN_TYPE12");
JSONObject json = new JSONObject();
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
json.put("id",listStr.get(0).getSubId());
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
json.put("id",listStr.get(0).getProjectId());
}
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
});
}
@@ -285,14 +298,18 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String finalMsg = msg;
list.forEach(p->{
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->Objects.equals(item.getTemporaryContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
return;
}
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(p.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
if(!StringUtils.isEmpty(p.getPhone())){
sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone()));
sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
map.put("workGroupName", finalMsg);
@@ -301,6 +318,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setListFile(listFile);
sendMessageDTO.setBusType("C_OPEN_TYPE12");
JSONObject json = new JSONObject();
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
json.put("id",listStr.get(0).getSubId());
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
json.put("id",listStr.get(0).getProjectId());
}
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
});
}
@@ -329,6 +353,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdOne());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameOne());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdOne());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}
if(!StringUtils.isEmpty(p.getContactsTemporaryIdTwo()) && Arrays.asList(s).contains(p.getContactsTemporaryIdTwo())){
@@ -340,6 +365,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdTwo());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameTwo());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdTwo());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}
if(!StringUtils.isEmpty(p.getContactsTemporaryIdThree()) && Arrays.asList(s).contains(p.getContactsTemporaryIdThree())){
@@ -351,6 +377,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdThree());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameThree());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdThree());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}
});