From 707d6fdae0fd2fa1cc566390698aa054dcac2c38 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 6 Jan 2025 18:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E9=83=A8=E5=89=A7=E7=9A=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/course/dao/CourseDetailsDao.java | 2 +- .../course/service/impl/CourseDetailsServiceImpl.java | 5 +++-- .../java/com/sqx/modules/course/vo/CourseDetailsSetVo.java | 1 - src/main/resources/mapper/course/CourseDetailsDao.xml | 3 +-- 4 files changed, 5 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 b9c5a2e2..40b5c024 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java @@ -23,7 +23,7 @@ public interface CourseDetailsDao extends BaseMapper { * @param wholesalePrice 10集价格 */ @Cacheable(cacheNames = "courseSets", key = "#courseId") - List courseSets(@Param("courseId") Long courseId, Integer isPrice, BigDecimal price, BigDecimal wholesalePrice); + List courseSets(@Param("courseId") Long courseId, Integer isPrice, BigDecimal wholesalePrice); List findByCourseId(@Param("id") Long id, @Param("userId") Long userId); 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 b31907c9..4ad75762 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 courseDetailsSetVos; if (freeWatch || courseUser != null) { - courseDetailsSetVos = baseMapper.courseSets(courseId, 2, null, null); + courseDetailsSetVos = baseMapper.courseSets(courseId, 2, null); } else { - courseDetailsSetVos = baseMapper.courseSets(courseId, 1, bean.getPrice(), bean.getWholesalePrice()); + courseDetailsSetVos = baseMapper.courseSets(courseId, 1, bean.getWholesalePrice()); } if (sort != null && sort > 2) { startSort = sort - 3; @@ -224,6 +224,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("current", current.get()); + map.put("price", freeWatch ? 0 : bean.getPrice()); map.put("title", bean.getTitle()); map.put("collect", collect == null || collect.equals(0) ? 0L : 1L); map.put("list", courseDetailsSetVos); diff --git a/src/main/java/com/sqx/modules/course/vo/CourseDetailsSetVo.java b/src/main/java/com/sqx/modules/course/vo/CourseDetailsSetVo.java index 48ee5546..1f6623ea 100644 --- a/src/main/java/com/sqx/modules/course/vo/CourseDetailsSetVo.java +++ b/src/main/java/com/sqx/modules/course/vo/CourseDetailsSetVo.java @@ -17,7 +17,6 @@ public class CourseDetailsSetVo { private Integer isPrice; private BigDecimal price; private BigDecimal wholesalePrice; - private BigDecimal countPrice; private Integer sort; /** diff --git a/src/main/resources/mapper/course/CourseDetailsDao.xml b/src/main/resources/mapper/course/CourseDetailsDao.xml index 229a948b..28ba0f78 100644 --- a/src/main/resources/mapper/course/CourseDetailsDao.xml +++ b/src/main/resources/mapper/course/CourseDetailsDao.xml @@ -7,9 +7,8 @@ , c.course_details_id as courseDetailsId , c.course_details_name as courseDetailsName , c.video_url as videoUrl - , c.price as countPrice + , c.price as price , c.sort as sort - , ifnull(#{price}, 0) as price , ifnull(#{wholesalePrice}, 0) as wholesalePrice , IF(#{isPrice} = 1, c.is_price, 2) AS isPrice , c.title_img as titleImg