From 16d7b9db0af91a96a083a4fe1e03b055f55a5d9a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 7 Jan 2025 14:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=9C=E6=AC=A2=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=92=8C=20=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8=20=E6=80=BB?=
 =?UTF-8?q?=E9=9B=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/course/dao/CourseCollectDao.java  |  1 +
 .../service/impl/CourseCollectServiceImpl.java    | 15 +++++++++++----
 .../resources/mapper/course/CourseCollectDao.xml  | 10 ++++++++++
 .../resources/mapper/course/CourseDetailsDao.xml  |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java
index 400c56aa..15c900a7 100644
--- a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java
+++ b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java
@@ -20,4 +20,5 @@ public interface CourseCollectDao extends BaseMapper<CourseCollect> {
 
 
     List<Course> selectClassify1In3(@Param("userId") Long userId);
+    List<Course> selectClassify1ByUserId(@Param("userId") Long userId);
 }
diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java
index 9ebc1663..749d1665 100644
--- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java
+++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java
@@ -132,10 +132,16 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
     @CachePut(value = "app:courseCollect", key = "#userId")
     public Result selectByUserId(Integer page, Integer limit, Long userId, Integer classify) {
         PageHelper.startPage(page, limit);
-        //查 收藏记录
-        List<Course> courses = baseMapper.selectClassify1In3(userId);
+        List<Course> courses = new ArrayList<>();
+        //收藏
+        if (classify.equals(1)) {
+            //查 收藏记录
+            courses = baseMapper.selectClassify1In3(userId);
+        } else {
+            courses = baseMapper.selectClassify1ByUserId(userId);
+        }
         if (CollectionUtil.isEmpty(courses)) {
-            return Result.success();
+            return Result.success().put("data", PageUtils.page(new PageInfo<>(courses), true));
         }
         //剧id
         Set<Long> courseIdList = new HashSet<>();
@@ -151,7 +157,8 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         List<CourseDetails> courseDetails1 = courseIdList.isEmpty() ? new ArrayList<>() :
                 courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>().in(CourseDetails::getCourseDetailsId, courseDetailIds));
         Map<Long, CourseDetails> courseDetailsMap = courseDetails1.stream().collect(Collectors.toMap(CourseDetails::getCourseId, item -> item));
-        Map<Long, Integer> countMap = courseDetailsDao.countByCourseId(courseIdList).stream()
+        List<CourseDetails> courseDetails2 = courseDetailsDao.countByCourseId(courseIdList);
+        Map<Long, Integer> countMap = courseDetails2.stream()
                 .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount));
 
         if (CollectionUtil.isNotEmpty(courseList)) {
diff --git a/src/main/resources/mapper/course/CourseCollectDao.xml b/src/main/resources/mapper/course/CourseCollectDao.xml
index 9ee13d38..6c57db52 100644
--- a/src/main/resources/mapper/course/CourseCollectDao.xml
+++ b/src/main/resources/mapper/course/CourseCollectDao.xml
@@ -40,5 +40,15 @@
         WHERE
             c1.classify = 3
           AND c1.user_id = #{userId}
+        order by c1.create_time desc
+    </select>
+
+    <select id="selectClassify1ByUserId" resultType="com.sqx.modules.course.entity.Course">
+        SELECT c1.course_id         as courseId,
+               c1.course_details_id as courseDetailsId
+        FROM `course_collect` c1
+        WHERE c1.classify = 3
+          AND c1.user_id = #{userId}
+        order by c1.create_time desc
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/course/CourseDetailsDao.xml b/src/main/resources/mapper/course/CourseDetailsDao.xml
index a7c7bea8..d1446b43 100644
--- a/src/main/resources/mapper/course/CourseDetailsDao.xml
+++ b/src/main/resources/mapper/course/CourseDetailsDao.xml
@@ -108,7 +108,7 @@
         SELECT course_id as courseId,
                COUNT(*)  AS courseDetailsCount
         FROM course_details
-        where course_details_id in
+        where course_id in
         <foreach collection="courseIdList" item="ids" open="(" separator="," close=")">
             #{ids}
         </foreach>