Merge branch 'v2.3.1' into 'dev'

回复评论推送

See merge request !70

community-api/src/main/java/com/tanpu/community/api/beans/req/notification/NotifyQueryReq.java

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class NotifyQueryReq {
 
-    @ApiModelProperty(value = "1:转发 2：点赞（主题点赞+评论点赞） 3：评论 4：关注 0:全部")
+    @ApiModelProperty(value = "1:转发 2：点赞（主题点赞+评论点赞） 3：评论（评论主题+回复评论） 4：关注  0:全部")
     private Integer type;
 
     @ApiModelProperty(value = "最后一条通知")

community-service/src/main/java/com/tanpu/community/service/NotificationService.java

@@ -165,12 +165,19 @@ public class NotificationService {
                     .eq(NotificationEntity::getNotificationId, lastId));
             queryWrapper.lt(NotificationEntity::getUpdateTime, lastOne.getCreateTime());
         }
-        if (!NotificationTypeEnum.ALL.getCode().equals(type) && !NotificationTypeEnum.LIKE.getCode().equals(type)) {
-            queryWrapper.eq(NotificationEntity::getMessageType, type);
-        } else if (NotificationTypeEnum.LIKE.getCode().equals(type)) {
-            // 类型2点赞返回评论点赞和主题点赞
-            queryWrapper.in(NotificationEntity::getMessageType,
-                    Arrays.asList(NotificationTypeEnum.LIKE.getCode(), NotificationTypeEnum.COMMENT_LIKE.getCode()));
+        if (!NotificationTypeEnum.ALL.getCode().equals(type)) {
+            if (NotificationTypeEnum.LIKE.getCode().equals(type)) {
+                // 类型2点赞返回评论点赞和主题点赞
+                queryWrapper.in(NotificationEntity::getMessageType,
+                        Arrays.asList(NotificationTypeEnum.LIKE.getCode(), NotificationTypeEnum.COMMENT_LIKE.getCode()));
+            } else if (!NotificationTypeEnum.COMMENT.getCode().equals(type)) {
+                // 类型3返回 回复主题和回复评论
+                queryWrapper.in(NotificationEntity::getMessageType,
+                        Arrays.asList(NotificationTypeEnum.COMMENT.getCode(), NotificationTypeEnum.COMMENT_REPLY.getCode()));
+            }else {
+                queryWrapper.eq(NotificationEntity::getMessageType, type);
+
+            }
         }
         return notificationMapper.selectList(queryWrapper);
     }
@@ -239,7 +246,7 @@ public class NotificationService {
         NotificationEntity last = notificationMapper.selectOne(new LambdaQueryWrapper<NotificationEntity>().eq(NotificationEntity::getNotifiedUserId, notifyUserId)
                 .orderByDesc(NotificationEntity::getUpdateTime)
                 .last("limit 1"));
-        if (commentNotify==null || last==null){
+        if (commentNotify == null || last == null) {
             return;
         }
         notificationMapper.deleteById(commentNotify.getId());