Merge branch 'v2.3.1' into 'dev'

评论的评论

See merge request !71

community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeNotifyQo.java

@@ -51,6 +51,8 @@ public class ThemeNotifyQo {
     private String content;
     @ApiModelProperty(value = "评论Id")
     private String commentId;
+    @ApiModelProperty(value = "回复的评论Id")
+    private String replyCommentId;
     @ApiModelProperty(value = "转发类型-主题id")
     private String forwardThemeId;
 

community-service/src/main/java/com/tanpu/community/manager/CommentManager.java

@@ -105,9 +105,9 @@ public class CommentManager {
         notificationService.putNotifyCache(themeEntity.getAuthorId(), userId, NotificationTypeEnum.COMMENT);
 
         // 回复提醒
-        if (StringUtils.isNotBlank(req.getReplyId())){
-            notificationService.insert(userId, themeEntity.getAuthorId(), NotificationTypeEnum.COMMENT_REPLY, commentEntity.getReplyId(), req.getComment());
-            notificationService.putNotifyCache(themeEntity.getAuthorId(), userId, NotificationTypeEnum.COMMENT_REPLY);
+        if (StringUtils.isNotBlank(req.getReplyUserId())){
+            notificationService.insert(userId, req.getReplyUserId(), NotificationTypeEnum.COMMENT_REPLY, commentEntity.getCommentId(), req.getComment());
+            notificationService.putNotifyCache(req.getReplyUserId(), userId, NotificationTypeEnum.COMMENT_REPLY);
 
         }
 

community-service/src/main/java/com/tanpu/community/manager/NotificationManager.java

@@ -102,10 +102,10 @@ public class NotificationManager {
                 CommentEntity commentEntity = commentService.queryByCommentId(themeNotifyQo.getCommentId());
                 if (commentEntity != null) {
                     themeNotifyQo.setFormerThemeId(commentEntity.getThemeId());
+                    themeNotifyQo.setReplyCommentId(commentEntity.getReplyId());
                     if (NotificationTypeEnum.COMMENT_LIKE.getCode().equals(themeNotifyQo.getMessageType())) {
                         themeNotifyQo.setContent(commentEntity.getContent());
                     }
-
                 }
 
             }
@@ -136,6 +136,14 @@ public class NotificationManager {
             if (StringUtils.isNotBlank(themeNotifyQo.getTopicId())) {
                 themeNotifyQo.setTopicTitle(topicService.queryTitleById(themeNotifyQo.getTopicId()));
             }
+            // 评论的评论
+            if  (NotificationTypeEnum.COMMENT.getCode().equals(themeNotifyQo.getMessageType())){
+                CommentEntity commentEntity = commentService.queryByCommentId(themeNotifyQo.getReplyCommentId());
+                if (commentEntity != null) {
+                    themeNotifyQo.setFormerContent(commentEntity.getContent());
+                }
+            }
+
             // 点赞聚合
             if (themeNotifyQo.getLikeUserCount() != null && themeNotifyQo.getLikeUserCount() > 1) {
                 List<UserBriefInfoQO> likeUsers = themeNotifyQo.getLikeUsers();