czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-01-06 17:11:08 +08:00
parent eaf928ef9c 6e9bf929c1
commit 18a5eae1ae
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
View File

@ -178,9 +178,9 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
} }
List<CourseDetailsSetVo> courseDetailsSetVos; List<CourseDetailsSetVo> courseDetailsSetVos;
if (freeWatch || courseUser != null) { if (freeWatch || courseUser != null) {
courseDetailsSetVos = baseMapper.courseSets(courseId,2, null, null); courseDetailsSetVos = baseMapper.courseSets(courseId, 2, null, null);
} else { } else {
courseDetailsSetVos = baseMapper.courseSets(courseId,1, bean.getPrice(), bean.getWholesalePrice()); courseDetailsSetVos = baseMapper.courseSets(courseId, 1, bean.getPrice(), bean.getWholesalePrice());
} }
if (sort != null && sort > 2) { if (sort != null && sort > 2) {
startSort = sort - 3; startSort = sort - 3;
@ -225,7 +225,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("current", current.get()); map.put("current", current.get());
map.put("title", bean.getTitle()); map.put("title", bean.getTitle());
map.put("collect", collect == null ? 0L : 1L); map.put("collect", collect == null || collect.equals(0) ? 0L : 1L);
map.put("list", courseDetailsSetVos); map.put("list", courseDetailsSetVos);
return new Result().put("data", map); return new Result().put("data", map);
} }

4
src/main/java/com/sqx/modules/course/vo/CourseDetailsSetVo.java
View File

@ -32,10 +32,6 @@ public class CourseDetailsSetVo {
* 点赞数 * 点赞数
*/ */
private Integer goodNum; private Integer goodNum;
/**
* 是否已追
*/
private Long isCollect;
/** /**
* 是否点赞 * 是否点赞
*/ */