zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-06-20 11:50:03 +08:00
parent 29e297d5b7 ea66a4fac1
commit f5870ae21e
5 changed files with 132 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java
View File

@@ -36,4 +36,7 @@ public class CourseCatalogueChapterEntity {
//视频列表
@TableField(exist = false)
private List<CourseCatalogueChapterVideoEntity> videoList;
//是否学过
@TableField(exist = false)
private int isLearned;
}

4
src/main/java/com/peanut/modules/sociology/controller/CourseController.java
View File

@@ -212,8 +212,8 @@ public class CourseController {
//我的课程-正在学习（收藏）
@RequestMapping("/getUserCourseStudying")
public R getUserCourseStudying(@RequestBody Map<String,Object> param){
List courseList = courseService.getUserCourseStudying(param);
public R getUserCourseStudying(){
List courseList = courseService.getUserCourseStudying();
return R.ok().put("courseList",courseList);
}

2
src/main/java/com/peanut/modules/sociology/service/CourseService.java
View File

@@ -32,7 +32,7 @@ public interface CourseService extends IService<CourseEntity> {
boolean delUserCourseStudying(Map<String,Object> param);
List getUserCourseStudying(Map<String,Object> param);
List getUserCourseStudying();
List getUserCourseBuy(Map<String,Object> param);

14
src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java
View File

@@ -2,13 +2,16 @@ package com.peanut.modules.sociology.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.dao.CourseCatalogueChapterDao;
import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao;
import com.peanut.modules.common.dao.UserCourseBuyDao;
import com.peanut.modules.common.dao.UserCourseVideoPositionDao;
import com.peanut.modules.common.entity.CourseCatalogueChapterEntity;
import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity;
import com.peanut.modules.common.entity.UserCourseBuyEntity;
import com.peanut.modules.common.entity.UserCourseVideoPositionEntity;
import com.peanut.modules.sociology.service.CourseCatalogueChapterService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,12 +28,23 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl<CourseCatalog
private CourseCatalogueChapterVideoDao courseCatalogueChapterVideoDao;
@Autowired
private UserCourseBuyDao userCourseBuyDao;
@Autowired
private UserCourseVideoPositionDao userCourseVideoPositionDao;
@Override
public List<CourseCatalogueChapterEntity> getCourseCatalogueChapterList(int id) {
LambdaQueryWrapper<CourseCatalogueChapterEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CourseCatalogueChapterEntity::getCatalogueId,id);
wrapper.orderByAsc(CourseCatalogueChapterEntity::getSort);
List<CourseCatalogueChapterEntity> list = this.list(wrapper);
if (list!=null&&list.size() > 0) {
for (CourseCatalogueChapterEntity courseCatalogueChapterEntity : list) {
MPJLambdaWrapper<UserCourseVideoPositionEntity> videoPositionWrapper = new MPJLambdaWrapper();
videoPositionWrapper.leftJoin(CourseCatalogueChapterVideoEntity.class,CourseCatalogueChapterVideoEntity::getId,UserCourseVideoPositionEntity::getVideoId);
videoPositionWrapper.eq(CourseCatalogueChapterVideoEntity::getChapterId,courseCatalogueChapterEntity.getId());
int count = userCourseVideoPositionDao.selectCount(videoPositionWrapper);
courseCatalogueChapterEntity.setIsLearned(count>0?1:0);
}
}
return list;
}

116
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -26,6 +26,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Autowired
private CourseToSociologyDao courseToSociologyDao;
@Autowired
private CourseToMedicineDao courseToMedicineDao;
@Autowired
private CourseCatalogueDao courseCatalogueDao;
@Autowired
private UserCourseBuyDao userCourseBuyDao;
@@ -43,6 +45,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
private MyUserDao userDao;
@Autowired
private ShopProductDao shopProductDao;
@Autowired
private UserVipDao userVipDao;
//根据标签获取课程列表
@@ -270,18 +274,66 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
}
@Override
public List getUserCourseStudying(Map<String, Object> param) {
public List getUserCourseStudying() {
MyUserEntity user = ShiroUtils.getUser();
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.distinct();
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);
wrapper.eq(UserCourseStudying::getUserId,param.get("userId"));
wrapper.eq(UserCourseStudying::getUserId,ShiroUtils.getUId());
wrapper.selectAll(CourseEntity.class);
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
wrapper.orderByAsc(CourseEntity::getSort);
List courseEntities = this.getBaseMapper().selectMaps(wrapper);
List<CourseEntity> courseEntities = this.getBaseMapper().selectList(wrapper);
if(courseEntities!=null&&courseEntities.size()>0){
for (CourseEntity co:courseEntities){
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new MPJLambdaWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
if (courseCatalogueEntities.size() > 0) {
//查询目录添加，购买的课程目录详细信息
for (CourseCatalogueEntity courseCatalogueEntity : courseCatalogueEntities) {
List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, user.getId()));
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
//完成度、上次学习时间
catalogueCompletion(courseCatalogueEntity);
//是否购买，生效时间
if ("1".equals(user.getVip())||"3".equals(user.getVip())){
//是超级会员或者国学会员
if (userVipList.size() > 0) {
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
}
courseCatalogueEntity.setIsBuy(1);
}else if ("0".equals(user.getVip())){
//普通用户
if (userCourseBuyList.size() > 0) {
courseCatalogueEntity.setIsBuy(1);
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
}else {
courseCatalogueEntity.setIsBuy(0);
}
}else if ("2".equals(user.getVip())){
//医学会员
//买的国学课程
if (userCourseBuyList.size() > 0) {
courseCatalogueEntity.setIsBuy(1);
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
}else {
//医学课程会员免费
List<CourseToMedicine> courseToMedicineList = courseToMedicineDao.selectList(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getCourseId, courseCatalogueEntity.getCourseId()));
if (courseToMedicineList.size() > 0) {
courseCatalogueEntity.setIsBuy(1);
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
}else {
courseCatalogueEntity.setIsBuy(0);
}
}
}
}
}
co.setCourseCatalogueEntityList(courseCatalogueEntities);
}
}
return courseEntities;
}
@@ -338,7 +390,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.eq(CourseToSociologyEntity::getSociologyId,c.getId());
wrapper.orderByAsc(CourseEntity::getSort);
courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper);
}else if ("0".equals(user.getVip())||"2".equals(user.getVip())){
}else if ("0".equals(user.getVip())){
MPJLambdaWrapper<UserCourseBuyEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getId,UserCourseBuyEntity::getCatalogueId);
wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseCatalogueEntity::getCourseId);
@@ -348,6 +400,23 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.eq(CourseToSociologyEntity::getSociologyId,c.getId());
wrapper.orderByAsc(CourseEntity::getSort);
courseEntities = userCourseBuyDao.selectJoinList(CourseEntity.class, wrapper);
}else if ("2".equals(user.getVip())){
MPJLambdaWrapper<UserCourseBuyEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getId,UserCourseBuyEntity::getCatalogueId);
wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseCatalogueEntity::getCourseId);
wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,UserCourseBuyEntity::getCourseId);
wrapper.selectAll(CourseEntity.class);
wrapper.eq(UserCourseBuyEntity::getUserId,user.getId());
wrapper.eq(CourseToSociologyEntity::getSociologyId,c.getId());
wrapper.orderByAsc(CourseEntity::getSort);
courseEntities = userCourseBuyDao.selectJoinList(CourseEntity.class, wrapper);
//添加 国学医学都有的课程
MPJLambdaWrapper<CourseEntity> vipWrapper = new MPJLambdaWrapper<>();
vipWrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
vipWrapper.exists("select * from course_to_medicine where del_flag = 0 and course_id = t.id");
vipWrapper.eq(CourseToSociologyEntity::getSociologyId,c.getId());
vipWrapper.selectAll(CourseEntity.class);
courseEntities.addAll(this.getBaseMapper().selectList(vipWrapper));
}
if(courseEntities!=null&&courseEntities.size()>0){
for (CourseEntity co:courseEntities){
@@ -359,9 +428,19 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
//查询目录添加，购买的课程目录详细信息
for (CourseCatalogueEntity courseCatalogueEntity : courseCatalogueEntities) {
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, user.getId()).eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, user.getId()));
//完成度、上次学习时间
catalogueCompletion(courseCatalogueEntity);
// catalogueCompletion(courseCatalogueEntity);
//是否购买，生效时间
if ("1".equals(user.getVip())||"3".equals(user.getVip())){
//是超级会员或者国学会员
if (userVipList.size() > 0) {
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
}
courseCatalogueEntity.setIsBuy(1);
}else if ("0".equals(user.getVip())){
//普通用户
if (userCourseBuyList.size() > 0) {
courseCatalogueEntity.setIsBuy(1);
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
@@ -369,6 +448,25 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
}else {
courseCatalogueEntity.setIsBuy(0);
}
}else if ("2".equals(user.getVip())){
//医学会员
//买的国学课程
if (userCourseBuyList.size() > 0) {
courseCatalogueEntity.setIsBuy(1);
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
}else {
//医学课程会员免费
List<CourseToMedicine> courseToMedicineList = courseToMedicineDao.selectList(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getCourseId, courseCatalogueEntity.getCourseId()));
if (courseToMedicineList.size() > 0) {
courseCatalogueEntity.setIsBuy(1);
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
}else {
courseCatalogueEntity.setIsBuy(0);
}
}
}
}
}
co.setCourseCatalogueEntityList(courseCatalogueEntities);