From 07aa1e07cf4c7d6a65af422d704aa0662183f428 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 6 Jan 2025 14:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E9=9B=86=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sqx/modules/course/dao/CourseDetailsDao.java   | 6 +++---
 .../course/service/impl/CourseDetailsServiceImpl.java       | 5 +++--
 src/main/resources/mapper/course/CourseDetailsDao.xml       | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java
index 4a7774ff..ff89c12b 100644
--- a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java
+++ b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java
@@ -22,8 +22,8 @@ public interface CourseDetailsDao extends BaseMapper<CourseDetails> {
      * @param price          全剧价格
      * @param wholesalePrice 10集价格
      */
-    @Cacheable(cacheNames = "courseSets" ,key = "#courseId")
-    List<CourseDetailsSetVo> courseSets(@Param("courseId") Long courseId, @Param("collect") Long collect, Integer isPrice, BigDecimal price, BigDecimal wholesalePrice);
+    @Cacheable(cacheNames = "courseSets", key = "#courseId")
+    List<CourseDetailsSetVo> courseSets(@Param("courseId") Long courseId, Integer isPrice, BigDecimal price, BigDecimal wholesalePrice);
 
     List<CourseDetails> findByCourseId(@Param("id") Long id, @Param("userId") Long userId);
 
@@ -41,7 +41,7 @@ public interface CourseDetailsDao extends BaseMapper<CourseDetails> {
      */
     Map<String, Object> countCourse(Long courseId);
 
-    @Cacheable(cacheNames = "courseCount" ,key = "#courseId")
+    @Cacheable(cacheNames = "courseCount", key = "#courseId")
     Integer countCourseByCourseId(Long courseId);
 
     List<CourseDetails> countByCourseId();
diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
index e8c686bf..cc386cc3 100644
--- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
+++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
@@ -178,9 +178,9 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
         }
         List<CourseDetailsSetVo> courseDetailsSetVos;
         if (freeWatch || courseUser != null) {
-            courseDetailsSetVos = baseMapper.courseSets(courseId, collect == null ? 0L : 1L, 2, null, null);
+            courseDetailsSetVos = baseMapper.courseSets(courseId,2, null, null);
         } else {
-            courseDetailsSetVos = baseMapper.courseSets(courseId, collect == null ? 0L : 1L, 1, bean.getPrice(), bean.getWholesalePrice());
+            courseDetailsSetVos = baseMapper.courseSets(courseId,1, bean.getPrice(), bean.getWholesalePrice());
         }
         if (sort != null && sort > 2) {
             startSort = sort - 3;
@@ -225,6 +225,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
         Map<String, Object> map = new HashMap<>();
         map.put("current", current.get());
         map.put("title", bean.getTitle());
+        map.put("collect", collect == null ? 0L : 1L);
         map.put("list", courseDetailsSetVos);
         return new Result().put("data", map);
     }
diff --git a/src/main/resources/mapper/course/CourseDetailsDao.xml b/src/main/resources/mapper/course/CourseDetailsDao.xml
index b33dbe22..f49e8d58 100644
--- a/src/main/resources/mapper/course/CourseDetailsDao.xml
+++ b/src/main/resources/mapper/course/CourseDetailsDao.xml
@@ -15,7 +15,6 @@
              , c.title_img                       as titleImg
              , c.good_num                        as goodNum
              , c.sort                            as sort
-             , IF(#{collect} = 1, 1, 0)          AS isCollect
         from course_details c
         where c.course_id = #{courseId}
         order by c.sort asc