From b1224eb9f48f60c5680a7f5898c486f29be492f6 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 27 Nov 2023 16:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E6=A1=88-=E6=8E=A8=E8=8D=90=E5=9B=BE?=
 =?UTF-8?q?=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookMedicalRecordsController.java         | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java
index 6d6ed2d9..ffe1081a 100644
--- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java
@@ -1,9 +1,7 @@
 package com.peanut.modules.book.controller;
 
-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.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.Query;
 import com.peanut.common.utils.R;
@@ -12,15 +10,11 @@ import com.peanut.modules.book.entity.BookMedicalRecordsEntity;
 import com.peanut.modules.book.entity.UserEbookBuyEntity;
 import com.peanut.modules.book.service.BookMedicalRecordsService;
 import com.peanut.modules.book.service.BookService;
-import com.peanut.modules.book.service.UserEbookBuyService;
-import com.peanut.modules.book.vo.UserOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -32,8 +26,6 @@ public class BookMedicalRecordsController {
     private BookMedicalRecordsService bookMedicalRecordsService;
     @Autowired
     private BookService bookService;
-    @Autowired
-    private UserEbookBuyService userEbookBuyService;
 
     /**
      * 已购图书列表
@@ -58,12 +50,22 @@ public class BookMedicalRecordsController {
      */
     @RequestMapping("/recommendBookList")
     public R recommendBookList(@RequestBody Map<String, Object> params){
-        List<BookEntity> list = bookMedicalRecordsService.getBooks(params);
-        int count = bookMedicalRecordsService.getCount((Integer) params.get("userId"));
-        Page<BookEntity> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(count);
-        page.setPages((int)Math.ceil(list.size()/page.getSize()));
+//        List<BookEntity> list = bookMedicalRecordsService.getBooks(params);
+//        int count = bookMedicalRecordsService.getCount((Integer) params.get("userId"));
+//        Page<BookEntity> page = new Page<>();
+//        page.setRecords(list);
+//        page.setTotal(count);
+//        page.setPages((int)Math.ceil(list.size()/page.getSize()));
+//        return R.ok().put("page", page);
+        MPJLambdaWrapper<BookEntity> wrapper = new MPJLambdaWrapper<>();
+        String exsql = "SELECT 1 FROM book_medical_records bmr WHERE bmr.book_id = id";
+        String notsql = "select 1 from user_ebook_buy b where b.book_id = id and user_id = "+params.get("userId");
+        wrapper.selectAll(BookEntity.class);
+        wrapper.exists(exsql);
+        wrapper.notExists(notsql);
+        wrapper.eq("state",1);
+        IPage<BookEntity> page = bookService.page(
+                new Query<BookEntity>().getPage(params),wrapper);
         return R.ok().put("page", page);
     }
     /**