From 35420de8fe9fa89215966d29ee090610825595e5 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Fri, 6 Aug 2021 17:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/service/ISysMessageNoticeService.java    |  2 +-
 .../service/impl/SysMessageNoticeServiceImpl.java   |  4 ++--
 .../service/impl/SysServicesTopicServiceImp.java    | 13 +++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysMessageNoticeService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysMessageNoticeService.java
index 8660258d9..a159a7748 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysMessageNoticeService.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysMessageNoticeService.java
@@ -114,7 +114,7 @@ public interface ISysMessageNoticeService
      * @param type 类型 1评论 2回复
      * @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查询打卡点评消息以及未读消息数量（包含点评营养师信息、客户信息、点评内容）
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysMessageNoticeServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysMessageNoticeServiceImpl.java
index 1d0dc0a0e..07e211a17 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysMessageNoticeServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysMessageNoticeServiceImpl.java
@@ -206,7 +206,7 @@ public class SysMessageNoticeServiceImpl implements ISysMessageNoticeService {
      */
     @Override
     @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) {
             return;
         }
@@ -231,7 +231,7 @@ public class SysMessageNoticeServiceImpl implements ISysMessageNoticeService {
         sysMessageNotice.setMessageCustomer(Long.parseLong(topic.getToUid()));
         sysMessageNotice.setMessageTitle("");
         sysMessageNotice.setMessageContent(JSONArray.toJSONString(content));
-        sysMessageNotice.setMessageKey(topic.getTopicId());
+        sysMessageNotice.setMessageKey(topicId);
         sendMessageNoticeToCustomer(MessageNoticeEnum.topicMessage, sysMessageNotice);
     }
 
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java
index eb16295ca..a182c5e38 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java
@@ -149,23 +149,24 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
             status.setRole(topic.getRole());
             servicesTopicMapper.updateSysServicesTopicStatus(status);
 
-            SysServicesTopic tp2 =  servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId());
-            System.out.println(tp2.getContent() + "---------" + tp2.getTopicId());
+            /*SysServicesTopic tp2 =  servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId());
+            System.out.println(tp2.getContent() + "---------" + tp2.getTopicId());*/
 
             //发送消息
             if("customer".equals(topic.getToRole()) && StringUtils.isNotEmpty(topic.getToUid())){
                 String content = "";
                 Long statusId = 0L;
+                SysServicesTopic tp = null;
                 if(StringUtils.isNotEmpty(topic.getCommentId())){
-                    SysServicesTopic tp =  servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId());
+                    tp =  servicesTopicMapper.getTopicContentByCommentId(topic.getCommentId());
                     if(tp != null){
                         content = tp.getContent();
                         //查询客户对象status表的id
                         statusId = servicesTopicMapper.getStatusIdByRoleAndTopicId(tp.getTopicId(), topic.getToRole());
                     }
                 }
-                if(StringUtils.isNotEmpty(content)){
-                    sysMessageNoticeService.sendTopicMessage(topic, 2, statusId, content);
+                if(tp != null && StringUtils.isNotEmpty(content)){
+                    sysMessageNoticeService.sendTopicMessage(topic, 2, tp.getTopicId(), statusId, content);
                 }
             }
 
@@ -195,7 +196,7 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
                 //查询客户对象status表的id
                 Long statusId = servicesTopicMapper.getStatusIdByRoleAndTopicId(topic.getTopicId(), topic.getToRole());
                 if(StringUtils.isNotEmpty(content)){
-                    sysMessageNoticeService.sendTopicMessage(topic, 1, statusId, content);
+                    sysMessageNoticeService.sendTopicMessage(topic, 1, topic.getTopicId(), statusId, content);
                 }
             }