From 15ce750c4258dde50a5cde661c7a8241ccf842f2 Mon Sep 17 00:00:00 2001
From: hxf13 <2994198039@qq.com>
Date: Fri, 19 Jul 2024 15:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TBook=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maku-server/src/main/java/net/maku/maku/query/TBookQuery.java         | 1 +
 .../main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java | 1 +
 .../src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java    | 2 ++
 maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java     | 2 +-
 maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java        | 2 +-
 maku-server/src/main/java/net/maku/maku/vo/TBookVO.java               | 4 ++--
 maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java    | 2 +-
 maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java           | 2 +-
 maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java    | 2 +-
 maku-server/src/main/java/net/maku/maku/vo/TUserVO.java               | 2 +-
 10 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java b/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java
index aae5546..eed0ba7 100644
--- a/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java
+++ b/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java
@@ -20,5 +20,6 @@ import java.util.Date;
 @Schema(description = "查询")
 public class TBookQuery extends Query {
     private String author;
+    private Integer category;
     private String bookName;
 }
\ No newline at end of file
diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java
index 72a7801..09deb95 100644
--- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java
+++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java
@@ -40,6 +40,7 @@ public class TBookCommentServiceImpl extends BaseServiceImpl<TBookCommentDao, TB
         wrapper.eq(ObjectUtil.isNotNull(query.getUserId()), TBookCommentEntity::getUserId, query.getUserId());
         wrapper.eq(ObjectUtil.isNotNull(query.getBookId()), TBookCommentEntity::getBookId, query.getBookId());
 
+
         return wrapper;
     }
 
diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java
index 7a5346a..9596276 100644
--- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java
+++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java
@@ -9,6 +9,7 @@ import net.maku.framework.common.exception.ServerException;
 import net.maku.framework.common.utils.PageResult;
 import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
 import net.maku.maku.convert.TBookConvert;
+import net.maku.maku.entity.TBookCommentEntity;
 import net.maku.maku.entity.TBookEntity;
 import net.maku.maku.query.TBookQuery;
 import net.maku.maku.vo.TBookVO;
@@ -40,6 +41,7 @@ public class TBookServiceImpl extends BaseServiceImpl<TBookDao, TBookEntity> imp
         LambdaQueryWrapper<TBookEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.like(TBookEntity::getBookName, query.getBookName());
         wrapper.like(TBookEntity::getAuthor, query.getAuthor());
+        wrapper.eq(ObjectUtil.isNotNull(query.getCategory()), TBookEntity::getCategory, query.getCategory());
         return wrapper;
     }
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java b/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java
index 501ce43..9f9dad7 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java
@@ -14,7 +14,7 @@ import java.util.Date;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "书籍收藏表视图数据")
 public class TBookCollectionVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java b/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java
index a132b74..d7f5b48 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java
@@ -14,7 +14,7 @@ import java.util.Date;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "书籍评论表视图数据")
 public class TBookCommentVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java b/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java
index 1aea373..2ed7016 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java
@@ -15,11 +15,11 @@ import java.util.Date;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "书本视图数据")
 public class TBookVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	private Integer id;
+	private Long id;
 
 	private String bookName;
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java
index b5be5ca..7de279b 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "订单详情表视图数据")
 public class TPurchaseDetailsVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java
index ce96ee1..6097807 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java
@@ -15,7 +15,7 @@ import java.util.Date;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "书籍订单表视图数据")
 public class TPurchaseVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java b/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java
index e1c530d..1c614e8 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java
@@ -14,7 +14,7 @@ import java.util.Date;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "购物车视图数据")
 public class TShoppingTrolleyVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
diff --git a/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java b/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java
index ca71eb8..97912fa 100644
--- a/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java
+++ b/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java
@@ -15,7 +15,7 @@ import java.util.Date;
 * @since 1.0.0 2024-07-16
 */
 @Data
-@Schema(description = "")
+@Schema(description = "用户视图数据")
 public class TUserVO implements Serializable {
 	private static final long serialVersionUID = 1L;