Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/book/controller/BookController.java

@@ -6,7 +6,9 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.peanut.common.utils.Query;
 import com.peanut.common.utils.ReadProvinceUtil;
 import com.peanut.modules.book.dao.BookDao;
 import com.peanut.modules.book.entity.*;
@@ -787,6 +789,17 @@ public class BookController {
         return null;
     }
 
+    //中医经典列表
+    @RequestMapping("/getClassicsBookList")
+    public R getClassicsBookList(@RequestBody Map<String,Object> params) {
+        BookEntity bookEntity = new BookEntity();
+        LambdaQueryWrapper<BookEntity> wrapper = new LambdaQueryWrapper();
+        wrapper.eq(BookEntity::getBookType,1);
+        IPage<BookEntity> page = bookService.page(
+                new Query<BookEntity>().getPage(params),wrapper);
+        return R.ok().put("page", page);
+    }
+
 
 
 

src/main/java/com/peanut/modules/book/entity/BookEntity.java

@@ -65,6 +65,10 @@ public class BookEntity implements Serializable {
 	 * 类型
 	 */
 	private String type;
+	/**
+	 * 图书类型 0普通 1古籍
+	 */
+	private Integer bookType;
 	/**
 	 * 价格
 	 */