fix:merge

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

@@ -326,6 +326,9 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         boolean courseTypeFlag = CourseScheduleEnum.existCourseType(dto.getCourseType(), "课程类型不正确！").equals(CourseScheduleEnum.PRACTICE);
         //先自校验传入时间是否交集
         List<CourseTimeEntity> timeList = dto.getTimeList();
+        if (CollectionUtils.isEmpty(timeList)) {
+            throw new BizException("课程时间不能为空");
+        }
         if (timeList.size() > 1) {
             for (int i = 0; i < timeList.size(); i++) {
                 if (i == timeList.size() - 1) {

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

@@ -86,6 +86,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     private SysUserFeignService sysUserFeignService;
 
     @Autowired
+    private TeacherTotalService totalService;
+
+    @Autowired
     private SysMessageService sysMessageService;
 
     @Autowired
@@ -813,14 +816,18 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         musicSheetWebsiteDetailVo.setFavoriteNum(musicSheetFavoriteNum);
 
         // 老师信息
-        TeacherHomeVo teacherVo = teacherService.queryUserInfo(detail.getUserId()).getData();
+        TeacherVo teacherVo = teacherService.detail(detail.getUserId());
         TeacherMusicSheetListVo teacherMusicSheetListVo = new TeacherMusicSheetListVo();
-        teacherMusicSheetListVo.setUserAvatar(teacherVo.getHeardUrl());
+        teacherMusicSheetListVo.setUserAvatar(teacherVo.getAvatar());
         teacherMusicSheetListVo.setUserName(teacherVo.getUsername());
         teacherMusicSheetListVo.setUserId(teacherVo.getUserId());
         teacherMusicSheetListVo.setEntryFlag(teacherVo.getEntryFlag());
         teacherMusicSheetListVo.setMusicianFlag(teacherVo.getMusicianFlag());
-        teacherMusicSheetListVo.setFansNum(teacherVo.getFansNum());
+
+        TeacherTotal total = totalService.getTotalById(teacherVo.getUserId());
+        if (total != null) {
+            teacherMusicSheetListVo.setFansNum(total.getFansNum());
+        }
         teacherMusicSheetListVo.setIsVip(teacherVo.getIsVip());
 
         if (sysUser != null) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -194,15 +194,14 @@
         where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.subject_id_) and s.del_flag_ = 0 ) as subjectNames
-        ,if( t1.num>0,t1.num,0) as musicSheetCount
+        ,(select count(1) as num
+        from album_music_relate amr
+        join music_sheet ms on amr.music_sheet_id_ = ms.id_
+        left join sys_user su on su.id_ = ms.user_id_
+        where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+       and amr.album_id_ = t.id_) as musicSheetCount
         ,if(t2.num >0,t2.num,0) as albumFavoriteCount
         from music_album t
-        left join (select count(1) as num,amr.album_id_
-            from album_music_relate amr
-            join music_sheet ms on amr.music_sheet_id_ = ms.id_
-            left join sys_user su on su.id_ = ms.user_id_
-            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
-        group by amr.album_id_) t1 on t1.album_id_ = t.id_
         left join (select count(1) as num,af.album_id_ from album_favorite af
             left join sys_user su on af.user_id_ = su.id_
             where su.del_flag_ = 0 group by af.album_id_

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -110,6 +110,9 @@
 			<if test="param.teacherId !=null">
 				AND g.teacher_id_ = #{param.teacherId}
 			</if>
+			<if test="param.auditVersion != null">
+				AND g.audit_version_ = #{param.auditVersion}
+			</if>
 			<if	test="param.lessonSubject != null and param.lessonSubject != ''">
 				AND g.lesson_subject_ = #{param.lessonSubject}
 			</if>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenVideoGroupController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
@@ -36,6 +37,8 @@ public class OpenVideoGroupController extends BaseController {
     @Autowired
     private VideoLessonGroupDetailService videoLessonGroupDetailService;
 
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
     /**
     * @Description: 查询视频课组
     * @Author: cy
@@ -45,6 +48,9 @@ public class OpenVideoGroupController extends BaseController {
     @PostMapping(value = "/page")
     public HttpResponseResult<PageInfo<VideoLessonGroupVo>> page(@RequestBody VideoLessonGroupSearch query) {
         query.setAuditStatus(AuthStatusEnum.PASS);
+
+        // 检查app版本
+        query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
         IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }