fix:专辑

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicAlbumController.java

@@ -56,16 +56,9 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        Student student = studentService.getById(sysUser.getId());
-        if (student == null) {
-            return failed("用户信息获取失败");
-        }
-
         // 检查app版本
         query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
 
-
-        query.setSubjectIds(student.getSubjectId());
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query);
@@ -94,7 +87,7 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑收藏
      */
-    @PostMapping("/favorite/{id}")
+    // @PostMapping("/favorite/{id}")
     @ApiOperation(value = "专辑收藏/取消收藏")
     public HttpResponseResult<Boolean> favorite(@ApiParam(value = "专辑编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -109,7 +102,7 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑收藏
      */
-    @GetMapping("/favorite")
+    // @GetMapping("/favorite")
     @ApiOperation(value = "收藏专辑列表")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> favoriteAlbum(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java

@@ -138,7 +138,19 @@ public class VideoLessonGroupController extends BaseController {
     @ApiOperation(value = "根据组id查询视频课&视频课组")
     @GetMapping(value="/selectVideoLesson")
     public HttpResponseResult<VideoLessonStudentVo> selectVideoLesson(@NotNull(message = "视频组id不能为空") Long groupId) {
-        return succeed(videoLessonGroupService.selectVideoLesson(groupId));
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null || sysUser.getId() == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+
+        VideoLessonStudentVo videoLessonStudentVo = videoLessonGroupService.selectVideoLesson(groupId);
+        if (videoLessonStudentVo.getLessonGroup() != null && sysUser.getId().equals(videoLessonStudentVo.getLessonGroup().getId())) {
+            videoLessonStudentVo.setAlreadyBuy(true);
+        } else {
+            videoLessonStudentVo.setAlreadyBuy(false);
+        }
+        return succeed(videoLessonStudentVo);
+
     }
 
     /**