diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java index 76237456..f27da71f 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java @@ -38,4 +38,9 @@ public class CourseCatalogueEntity{ */ @TableField(exist = false) private Integer needCreate; + /** + * isBuy:0否1是 + */ + @TableField(exist = false) + private Integer isBuy; } diff --git a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java index 6908073e..7eb7144c 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java @@ -24,15 +24,6 @@ public class HomeController { @Autowired private CourseSociologyService courseSociologyService; - - - //首页-我的课程 - @RequestMapping("/getMyCourse") - public R getMyCourse(String userId){ - List courseList = courseService.getMyCourse(userId); - return R.ok().put("myCourse",courseList); - } - /** *获取国学标签列表 * @param param diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index cbc2fdce..8522e084 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -10,7 +10,6 @@ import java.util.Map; public interface CourseService extends IService { - List getMyCourse(String userId); List getCourseListBySociology(String sociologyId); diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index 139f6424..b01ef981 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.peanut.modules.common.dao.CourseCatalogueDao; -import com.peanut.modules.common.dao.CourseDao; -import com.peanut.modules.common.dao.CourseToSociologyDao; -import com.peanut.modules.common.dao.UserToCourseDao; +import com.peanut.common.utils.ShiroUtils; +import com.peanut.modules.common.dao.*; import com.peanut.modules.common.entity.*; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.sociology.service.CourseService; @@ -30,18 +28,9 @@ public class CourseServiceImpl extends ServiceImpl impl private CourseToSociologyDao courseToSociologyDao; @Autowired private CourseCatalogueDao courseCatalogueDao; + @Autowired + private UserCourseBuyDao userCourseBuyDao; - //我的课程 - @Override - public List getMyCourse(String userId) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.selectAll(CourseEntity.class); - wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,UserToCourseEntity::getCourseId); - wrapper.groupBy(UserToCourseEntity::getCourseId); - wrapper.eq(UserToCourseEntity::getUserId,userId); - List courseList = userToCourseDao.selectMaps(wrapper); - return courseList; - } //根据标签获取课程列表 @Override @@ -90,6 +79,11 @@ public class CourseServiceImpl extends ServiceImpl impl CourseEntity course = this.getById(id); flag.put("course",course); List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, id)); + Integer uId = ShiroUtils.getUId(); + for (CourseCatalogueEntity c :courseCatalogueEntities){ + Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId())); + c.setIsBuy(integer>0?1:0); + } flag.put("catalogues",courseCatalogueEntities); return flag; }