fix:merge

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherFreeTime.java

@@ -44,7 +44,7 @@ public class TeacherFreeTime implements Serializable {
 
     @NotBlank(message = "声部单课时金额不可为空")
     @TableField("subject_price_")
-    @ApiModelProperty(value = "声部单课时金额:[{'id':1,'price':100.1}]")
+    @ApiModelProperty(value = "声部单课时金额:[{'subjectId':1,'subjectPrice':100.88,'subjectName':'西洋管乐'},{'subjectId':2,'subjectPrice':200.88,'subjectName':'长笛'}]")
     private String subjectPrice;
 
     @TableField("monday_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonGroupDetailService.java

@@ -29,5 +29,5 @@ public interface VideoLessonGroupDetailService extends IService<VideoLessonGroup
 
     void deleteDetail(Long id);
 
-    VideoLessonStudentVo selectVideoLesson(Long groupId);
+    VideoLessonStudentVo selectVideoLesson(Long groupId,Long userId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherFreeTimeServiceImpl.java

@@ -20,7 +20,6 @@ import java.util.Objects;
 
 /**
  * 老师可排课时间表(TeacherFreeTime)表服务实现类
- *
  * @author zx
  * @since 2022-03-25 10:04:27
  */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupDetailServiceImpl.java

@@ -1,16 +1,22 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.toolset.utils.obj.ObjectUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -38,6 +44,8 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
     private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
     @Autowired
     private VideoLessonGroupDao videoLessonGroupDao;
+    @Autowired
+    private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
 
     public VideoLessonGroupDetailDao getDao() {
         return videoLessonGroupDetailDao;
@@ -130,9 +138,15 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
     * @Date: 2022/4/2
     */
     @Override
-    public VideoLessonStudentVo selectVideoLesson(Long groupId) {
+    public VideoLessonStudentVo selectVideoLesson(Long groupId,Long userId) {
         VideoLessonStudentVo lessonStudentVo = new VideoLessonStudentVo();
 
+        //校验课程是否购买
+        VideoLessonPurchaseRecord isAlreadyBuy= videoLessonPurchaseRecordDao.selectOne(Wrappers.<VideoLessonPurchaseRecord>lambdaQuery()
+                .eq(VideoLessonPurchaseRecord::getStudentId, userId)
+                .eq(VideoLessonPurchaseRecord::getVideoLessonGroupId, groupId));
+        lessonStudentVo.setAlreadyBuy(!ObjectUtil.isEmpty(isAlreadyBuy));
+
         VideoLessonGroupSearch query = new VideoLessonGroupSearch();
         //筛选已审核的视频课
         query.setAuditStatus(AuthStatusEnum.PASS);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonStudentVo.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
@@ -16,6 +17,17 @@ public class VideoLessonStudentVo extends BaseEntity {
 
     private List<VideoLessonGroupDetail> detailList;
 
+    @ApiModelProperty(value = "true已买,false未买")
+    private Boolean isAlreadyBuy;
+
+    public Boolean getAlreadyBuy() {
+        return isAlreadyBuy;
+    }
+
+    public void setAlreadyBuy(Boolean alreadyBuy) {
+        isAlreadyBuy = alreadyBuy;
+    }
+
     public VideoLessonGroupVo getLessonGroup() {
         return lessonGroup;
     }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VideoLessonController.java

@@ -52,7 +52,11 @@ public class VideoLessonController extends BaseController {
     @ApiOperation(value = "根据组id查询视频课")
     @GetMapping(value = "/selectVideoLesson")
     public HttpResponseResult<VideoLessonStudentVo> selectVideoLesson(@NotNull(message = "视频组id不能为空") Long groupId) {
-        return succeed(detailService.selectVideoLesson(groupId));
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(detailService.selectVideoLesson(groupId,user.getId()));
     }
 
     /**