From 26d5b51f637db4094d83cdd34310316b365d711c Mon Sep 17 00:00:00 2001 From: TianZhou <3570544406@qq.com> Date: Wed, 24 Jul 2024 09:53:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/net/maku/maku/controller/TBookCollectionController.java | 4 ++-- .../main/java/net/maku/maku/controller/TBookCommentController.java | 4 ++-- .../java/net/maku/maku/controller/TPurchaseDetailsController.java | 4 ++-- .../java/net/maku/maku/controller/TShoppingTrolleyController.java | 4 ++-- maku-server/src/main/resources/mapper/maku/TShoppingTrolleyDao.xml | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java index c022383..2c36a68 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java @@ -45,7 +45,7 @@ public class TBookCollectionController { private final RedisCache redisCache; @GetMapping("/mylist") - public List getBookCollectionByUserId(HttpServletRequest request) { + public Result> getBookCollectionByUserId(HttpServletRequest request) { String token = request.getHeader("token"); TUserEntity entity = (TUserEntity) redisCache.get(token); if(ObjectUtils.isNull(entity)){ @@ -58,7 +58,7 @@ public class TBookCollectionController { ZonedDateTime zdt = currentTime.atZone(zoneId); Date date = Date.from(zdt.toInstant()); - return bookCollectionDao.selectBookCollectionByUserId(Long.valueOf(userId)); + return Result.ok(bookCollectionDao.selectBookCollectionByUserId(Long.valueOf(userId))); } @GetMapping("page") diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java index 852df27..ae265ae 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java @@ -116,7 +116,7 @@ public class TBookCommentController { } @GetMapping("/list") @Operation(summary = "查看评论列表") - public List list(HttpServletRequest request){ + public Result> list(HttpServletRequest request){ String token = request.getHeader("token"); TUserEntity entity = (TUserEntity) redisCache.get(token); if(ObjectUtils.isNull(entity)){ @@ -124,7 +124,7 @@ public class TBookCommentController { } TUserEntity tUserEntity = (TUserEntity) redisCache.get(token); Integer userId=tUserEntity.getId(); - return tBookCommentDao.findAll(Long.valueOf(userId)); + return Result.ok(tBookCommentDao.findAll(Long.valueOf(userId))); } } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/controller/TPurchaseDetailsController.java b/maku-server/src/main/java/net/maku/maku/controller/TPurchaseDetailsController.java index 1625e60..47ddd81 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TPurchaseDetailsController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TPurchaseDetailsController.java @@ -52,7 +52,7 @@ public class TPurchaseDetailsController { private final RedisCache redisCache; private final TPurchaseDetailsDao tPurchaseDetailsDao; @GetMapping("/a") - public List getBookCollectionByUserId(HttpServletRequest request) { + public Result> getBookCollectionByUserId(HttpServletRequest request) { String token = request.getHeader("token"); TUserEntity entity = (TUserEntity) redisCache.get(token); if(ObjectUtils.isNull(entity)){ @@ -70,7 +70,7 @@ public class TPurchaseDetailsController { ZonedDateTime zdt = currentTime.atZone(zoneId); Date date = Date.from(zdt.toInstant()); - return tPurchaseDetailsService.selectByUserId(userId); + return Result.ok(tPurchaseDetailsService.selectByUserId(userId)); } @PostMapping("/buy") @Operation(summary = "购买") diff --git a/maku-server/src/main/java/net/maku/maku/controller/TShoppingTrolleyController.java b/maku-server/src/main/java/net/maku/maku/controller/TShoppingTrolleyController.java index a248e13..8e24443 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TShoppingTrolleyController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TShoppingTrolleyController.java @@ -112,7 +112,7 @@ public class TShoppingTrolleyController { return Result.ok(list); } @GetMapping("/newmyshop") - public List getBookCollectionByUserId(HttpServletRequest request) { + public Result> getBookCollectionByUserId(HttpServletRequest request) { String token = request.getHeader("token"); TUserEntity entity = (TUserEntity) redisCache.get(token); if(ObjectUtils.isNull(entity)){ @@ -130,7 +130,7 @@ public class TShoppingTrolleyController { ZonedDateTime zdt = currentTime.atZone(zoneId); Date date = Date.from(zdt.toInstant()); - return tShoppingTrolleyDao.selectShoppingTrolleyByUserId(Long.valueOf(userId)); + return Result.ok(tShoppingTrolleyDao.selectShoppingTrolleyByUserId(Long.valueOf(userId))); } @DeleteMapping("/clean") @Operation(summary = "清空购物车") diff --git a/maku-server/src/main/resources/mapper/maku/TShoppingTrolleyDao.xml b/maku-server/src/main/resources/mapper/maku/TShoppingTrolleyDao.xml index 419b7ef..7c4d313 100644 --- a/maku-server/src/main/resources/mapper/maku/TShoppingTrolleyDao.xml +++ b/maku-server/src/main/resources/mapper/maku/TShoppingTrolleyDao.xml @@ -21,7 +21,8 @@ tb.book_name, tb.price, tb.book_cover, - tb.introduction + tb.introduction, + st.number FROM t_shopping_trolley st LEFT JOIN t_book tb ON st.book_id=tb.id, (SELECT @row_number := 0) AS dummy