diff --git a/src/main/java/com/peanut/modules/bookAbroad/controller/BookAbroadController.java b/src/main/java/com/peanut/modules/bookAbroad/controller/BookAbroadController.java index 7be79ba2..e0a4663c 100644 --- a/src/main/java/com/peanut/modules/bookAbroad/controller/BookAbroadController.java +++ b/src/main/java/com/peanut/modules/bookAbroad/controller/BookAbroadController.java @@ -40,7 +40,7 @@ public class BookAbroadController { //评论树 @RequestMapping("/getBookAbroadCommentTree") - public List getBookAbroadCommentTree(@RequestBody Map params) { + public R getBookAbroadCommentTree(@RequestBody Map params) { List comments = bookAbroadCommentService.list(new LambdaQueryWrapper() .eq(BookAbroadComment::getBookId,params.get("bookId"))); List commentsTree = comments.stream().filter((bookAbroadComment) -> @@ -49,13 +49,15 @@ public class BookAbroadController { comment.setIsLike(bookAbroadCommentLikeService.count(new LambdaQueryWrapper() .eq(BookAbroadCommentLike::getCommentId,comment.getId()) .eq(BookAbroadCommentLike::getUserId,ShiroUtils.getUId()))); + comment.setLikeCount(bookAbroadCommentLikeService.count(new LambdaQueryWrapper() + .eq(BookAbroadCommentLike::getCommentId,comment.getId()))); comment.setUserEntity(userService.getOne(new LambdaQueryWrapper() .select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getNickname,MyUserEntity::getAvatar) .eq(MyUserEntity::getId,comment.getUserId()))); comment.setChildren(getLabelChildrens(comment,comments)); return comment; }).collect(Collectors.toList()); - return commentsTree; + return R.ok().put("commentsTree",commentsTree); } private List getLabelChildrens(BookAbroadComment root,List all){ diff --git a/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java b/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java index 3c8590e0..b1037afc 100644 --- a/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/bookAbroad/controller/HomeController.java @@ -171,6 +171,16 @@ public class HomeController { return R.ok().put("contentPage",contentPage); } + //已读\已买人数 + @RequestMapping("/getBookReadCount") + public R getBookReadCount(@RequestBody Map params){ + int readCount = bookReadRateService.count(new LambdaQueryWrapper() + .eq(BookReadRateEntity::getBookId,params.get("bookId"))); + int buyCount = userEbookBuyService.count(new LambdaQueryWrapper() + .eq(UserEbookBuyEntity::getBookId,params.get("bookId"))); + return R.ok().put("readCount",readCount).put("buyCount",buyCount); + } + //获取当前书的阅读记录 @RequestMapping("/getBookReadRate") public R getBookReadRate(@RequestBody Map params){ diff --git a/src/main/java/com/peanut/modules/common/entity/BookAbroadComment.java b/src/main/java/com/peanut/modules/common/entity/BookAbroadComment.java index e2c6a7b4..7fa06a8b 100644 --- a/src/main/java/com/peanut/modules/common/entity/BookAbroadComment.java +++ b/src/main/java/com/peanut/modules/common/entity/BookAbroadComment.java @@ -33,6 +33,8 @@ public class BookAbroadComment implements Serializable { @TableField(exist = false) private int isLike; @TableField(exist = false) + private int likeCount; + @TableField(exist = false) private MyUserEntity userEntity; @TableField(exist = false) private List children;