Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
huangdeliang 2021-08-06 17:14:55 +08:00
commit 485c7c8f36
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysMessageNoticeService.java
View File

@ -114,7 +114,7 @@ public interface ISysMessageNoticeService
* @param type 类型 1评论 2回复 * @param type 类型 1评论 2回复
* @param originalContent 话题内容或被回复的内容 * @param originalContent 话题内容或被回复的内容
*/ */
public void sendTopicMessage(SysServicesTopic topic, int type, Long statusId, String originalContent); public void sendTopicMessage(SysServicesTopic topic, int type, String topicId, Long statusId, String originalContent);
/** /**
* 根据客户ID查询打卡点评消息以及未读消息数量（包含点评营养师信息、客户信息、点评内容） * 根据客户ID查询打卡点评消息以及未读消息数量（包含点评营养师信息、客户信息、点评内容）

4
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysMessageNoticeServiceImpl.java
View File

@ -206,7 +206,7 @@ public class SysMessageNoticeServiceImpl implements ISysMessageNoticeService {
*/ */
@Override @Override
@Async @Async
public void sendTopicMessage(SysServicesTopic topic, int type, Long statusId, String originalContent) { public void sendTopicMessage(SysServicesTopic topic, int type, String topicId, Long statusId, String originalContent) {
if (topic == null) { if (topic == null) {
return; return;
} }
@ -231,7 +231,7 @@ public class SysMessageNoticeServiceImpl implements ISysMessageNoticeService {
sysMessageNotice.setMessageCustomer(Long.parseLong(topic.getToUid())); sysMessageNotice.setMessageCustomer(Long.parseLong(topic.getToUid()));
sysMessageNotice.setMessageTitle(""); sysMessageNotice.setMessageTitle("");
sysMessageNotice.setMessageContent(JSONArray.toJSONString(content)); sysMessageNotice.setMessageContent(JSONArray.toJSONString(content));
sysMessageNotice.setMessageKey(topic.getTopicId()); sysMessageNotice.setMessageKey(topicId);
sendMessageNoticeToCustomer(MessageNoticeEnum.topicMessage, sysMessageNotice); sendMessageNoticeToCustomer(MessageNoticeEnum.topicMessage, sysMessageNotice);
} }

13
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java
View File

@ -149,23 +149,24 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
status.setRole(topic.getRole()); status.setRole(topic.getRole());
servicesTopicMapper.updateSysServicesTopicStatus(status); servicesTopicMapper.updateSysServicesTopicStatus(status);
SysServicesTopic tp2 = servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId()); /*SysServicesTopic tp2 = servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId());
System.out.println(tp2.getContent() + "---------" + tp2.getTopicId()); System.out.println(tp2.getContent() + "---------" + tp2.getTopicId());*/
//发送消息 //发送消息
if("customer".equals(topic.getToRole()) && StringUtils.isNotEmpty(topic.getToUid())){ if("customer".equals(topic.getToRole()) && StringUtils.isNotEmpty(topic.getToUid())){
String content = ""; String content = "";
Long statusId = 0L; Long statusId = 0L;
SysServicesTopic tp = null;
if(StringUtils.isNotEmpty(topic.getCommentId())){ if(StringUtils.isNotEmpty(topic.getCommentId())){
SysServicesTopic tp = servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId()); tp = servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId());
if(tp != null){ if(tp != null){
content = tp.getContent(); content = tp.getContent();
//查询客户对象status表的id //查询客户对象status表的id
statusId = servicesTopicMapper.getStatusIdByRoleAndTopicId(tp.getTopicId(), topic.getToRole()); statusId = servicesTopicMapper.getStatusIdByRoleAndTopicId(tp.getTopicId(), topic.getToRole());
} }
} }
if(StringUtils.isNotEmpty(content)){ if(tp != null && StringUtils.isNotEmpty(content)){
sysMessageNoticeService.sendTopicMessage(topic, 2, statusId, content); sysMessageNoticeService.sendTopicMessage(topic, 2, tp.getTopicId(), statusId, content);
} }
} }
@ -195,7 +196,7 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
//查询客户对象status表的id //查询客户对象status表的id
Long statusId = servicesTopicMapper.getStatusIdByRoleAndTopicId(topic.getTopicId(), topic.getToRole()); Long statusId = servicesTopicMapper.getStatusIdByRoleAndTopicId(topic.getTopicId(), topic.getToRole());
if(StringUtils.isNotEmpty(content)){ if(StringUtils.isNotEmpty(content)){
sysMessageNoticeService.sendTopicMessage(topic, 1, statusId, content); sysMessageNoticeService.sendTopicMessage(topic, 1, topic.getTopicId(), statusId, content);
} }
} }