From a21339d68d170766d1d595d9c6b5f653aaaa47ee Mon Sep 17 00:00:00 2001
From: x ronger <ronger-x@outlook.com>
Date: Sun, 8 Mar 2020 01:00:28 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=AF=84=E8=AE=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CommentServiceImpl.java      | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java b/src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java
index 2e7b044..dfe6232 100644
--- a/src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java
+++ b/src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java
@@ -81,20 +81,29 @@ public class CommentServiceImpl extends AbstractService<Comment> implements Comm
         commentSharpUrl.append("/comment/").append(comment.getIdComment());
         commentMapper.updateCommentSharpUrl(comment.getIdComment(), commentSharpUrl.toString());
 
-        // 评论者不是作者本人则进行消息通知
-        if (!article.getArticleAuthorId().equals(comment.getCommentAuthorId())) {
-            String commentContent = comment.getCommentContent();
-            if(StringUtils.isNotBlank(commentContent)){
-                Integer length = commentContent.length();
-                if(length > MAX_PREVIEW){
-                    length = 200;
-                }
-                String commentPreviewContent = commentContent.substring(0,length);
-                commentContent = Html2TextUtil.getContent(commentPreviewContent);
+        String commentContent = comment.getCommentContent();
+        if(StringUtils.isNotBlank(commentContent)){
+            Integer length = commentContent.length();
+            if(length > MAX_PREVIEW){
+                length = 200;
+            }
+            String commentPreviewContent = commentContent.substring(0,length);
+            commentContent = Html2TextUtil.getContent(commentPreviewContent);
+            // 评论者不是作者本人则进行消息通知
+            if (article.getArticleAuthorId().equals(comment.getCommentAuthorId())) {
                 NotificationUtils.saveNotification(article.getArticleAuthorId(),comment.getIdComment(), NotificationConstant.Comment, commentContent);
             }
+            // 判断是否是回复消息
+            if (comment.getCommentOriginalCommentId() != null) {
+                Comment originalComment = commentMapper.selectByPrimaryKey(comment.getCommentOriginalCommentId());
+                // 回复消息时,评论者不是上级评论作者则进行消息通知
+                if (!comment.getCommentAuthorId().equals(originalComment.getCommentAuthorId())) {
+                    NotificationUtils.saveNotification(originalComment.getCommentAuthorId(),comment.getIdComment(), NotificationConstant.Comment, commentContent);
+                }
+            }
         }
 
+
         return map;
     }
 }