liujunchi 2 年之前
父節點
當前提交
7bd3c7ac25

+ 2 - 2
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -238,8 +238,8 @@ public class VideoLessonController extends BaseController {
         if (lessonVo.getLessonGroup().getDraftFlag().equals(YesOrNoEnum.NO) && CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }
-        lessonGroupService.add(lessonVo, sysUser);
-        return succeed();
+        Long add = lessonGroupService.add(lessonVo, sysUser);
+        return succeed(add);
     }
 
     /**

+ 1 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonGroupService.java

@@ -7,7 +7,6 @@ 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.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
 import com.yonge.cooleshow.biz.dal.queryInfo.CourseRelationQueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.wrapper.course.CourseRelationWrapper;
@@ -39,7 +38,7 @@ public interface VideoLessonGroupService extends IService<VideoLessonGroup> {
 
     void deleteGroup(Long id);
 
-    void add(VideoLessonVo lessonVo, SysUser sysUser);
+    Long add(VideoLessonVo lessonVo, SysUser sysUser);
 
     IPage<VideoLessonStudentDetailVo> selectStudentPage(IPage<VideoLessonStudentDetailVo> page, VideoLessonSearch search);
 

+ 9 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java

@@ -14,7 +14,6 @@ import com.google.common.collect.Lists;
 import com.yonge.cooleshow.biz.dal.dto.CourseMusicAlbumRelationDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseRelationMusicAlbum;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
-import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
 import com.yonge.cooleshow.biz.dal.queryInfo.CourseRelationQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CourseRelationMusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
@@ -371,12 +370,16 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
      * @Description: 新增视频课组&视频课
      * @Author: cy
      * @Date: 2022/4/1
+     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void add(VideoLessonVo lessonVo, SysUser sysUser) {
+    public Long add(VideoLessonVo lessonVo, SysUser sysUser) {
         VideoLessonGroup lessonGroup = lessonVo.getLessonGroup();
         List<VideoLessonGroupDetailDto> lessonList = lessonVo.getLessonList();
+        if (CollectionUtils.isEmpty(lessonList)) {
+            lessonList = new ArrayList<>();
+        }
         lessonGroup.setLessonCount(lessonList.size());
 
         //校验声部
@@ -413,7 +416,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         }
 
         //添加课程
-        videoLessonGroupDetailDao.insertVideoLesson(lessonList);
+        if (CollectionUtils.isNotEmpty(lessonList)) {
+            videoLessonGroupDetailDao.insertVideoLesson(lessonList);
+        }
 
         //刷新统计
         VideoLessonGroupUpVo groupUpVo = new VideoLessonGroupUpVo();
@@ -450,7 +455,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
 
             videoLessonGroupLogService.insert(videoLessonGroupLog);
         }
-
+        return lessonGroup.getId();
     }
 
     /**