Merge branch 'dev_v1.3.7_20221020'

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

@@ -228,6 +228,11 @@ public class VideoLessonController extends BaseController {
     @PostMapping(value = "/add", consumes = "application/json", produces = "application/json")
     public HttpResponseResult<Object> add( @RequestBody VideoLessonVo lessonVo) {
 
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        lessonVo.setUserBy(user.getId());
         if (lessonVo.getLessonGroup().getTeacherId() == null) {
             return failed("请设置所属老师");
         }
@@ -252,6 +257,12 @@ public class VideoLessonController extends BaseController {
     @PostMapping(value = "/update", consumes = "application/json", produces = "application/json")
     public HttpResponseResult<Object> update(@RequestBody VideoLessonVo lessonVo) {
 
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        lessonVo.setUserBy(user.getId());
+
         if (lessonVo.getLessonGroup().getTeacherId() == null) {
             return failed("请设置所属老师");
         }

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

@@ -75,18 +75,6 @@ public class VideoLessonGroupDetail extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;  //更新时间
 
-	@TableField("relation_type_")
-	@ApiModelProperty(value = "关联曲目专辑类型,RECOMMEND:推荐  GIFT:赠品")
-	private CourseRelationTypeEnum relationType;
-
-	public CourseRelationTypeEnum getRelationType() {
-		return relationType;
-	}
-
-	public void setRelationType(CourseRelationTypeEnum relationType) {
-		this.relationType = relationType;
-	}
-
 	public VideoLessonGroupDetail setId(Long id) {
 	    this.id = id;
 	    return this;

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

@@ -271,7 +271,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     /**
      * 处理课程曲目关联关系
      */
-    private void courseMusicAlbumRelation(List<VideoLessonGroupDetailDto> lessonList,Long lessonGroupId) {
+    private void courseMusicAlbumRelation(List<VideoLessonGroupDetailDto> lessonList, Long lessonGroupId, Long userBy) {
         // 设置关联曲目
 
         // 需要更新的关联数据
@@ -322,10 +322,10 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                 courseRelationMusicAlbum.setDelFlog(1);
                 courseRelationMusicAlbum.setRelationType(courseMusicAlbumRelationDto.getRelationMusicAlbum());
                 courseRelationMusicAlbum.setUseRelationType(courseMusicAlbumRelationDto.getUseRelationType());
-                courseRelationMusicAlbum.setUpdateBy(videoLessonGroupDetailDto.getUpdateBy());
+                courseRelationMusicAlbum.setUpdateBy(userBy);
                 courseRelationMusicAlbum.setUpdateTime(new Date());
                 if (courseRelationMusicAlbum.getId() == null) {
-                    courseRelationMusicAlbum.setCreateBy(videoLessonGroupDetailDto.getUpdateBy());
+                    courseRelationMusicAlbum.setCreateBy(userBy);
                     courseRelationMusicAlbum.setCreateTime(new Date());
                     courseRelationMusicAlbum.setDelFlog(2);
                     addCourseRelationMusicAlbums.add(courseRelationMusicAlbum);
@@ -467,7 +467,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
 
 
         // 设置关联曲目
-        courseMusicAlbumRelation(lessonList,lessonGroup.getId());
+        courseMusicAlbumRelation(lessonList, lessonGroup.getId(), lessonVo.getUserBy());
 
         if (YesOrNoEnum.NO.equals(lessonGroup.getDraftFlag())) {
             VideoLessonGroupLog videoLessonGroupLog = new VideoLessonGroupLog();
@@ -629,6 +629,20 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             lessonGroup.setDraftFlag(YesOrNoEnum.NO);
         }
 
+        //修改课程组记录
+        lessonGroup.setAuditVersion(YesOrNoEnum.NO);
+        lessonGroup.setAuditStatus(AuthStatusEnum.DOING);
+
+        if (lessonGroup.getDraftFlag().equals(YesOrNoEnum.YES)) {
+            lessonGroup.setAuditStatus(AuthStatusEnum.PASS);
+            lessonGroup.setShelvesFlag(0);
+        }
+        lessonGroup.setUpdateTime(date);
+        videoLessonGroupDao.updateById(lessonGroup);
+
+        // 设置关联曲目
+        courseMusicAlbumRelation(lessonList,lessonGroup.getId(),lessonVo.getUserBy());
+
         if (lessonGroup.getDraftFlag().equals(YesOrNoEnum.NO)) {
 
             VideoLessonGroupLog videoLessonGroupLog = new VideoLessonGroupLog();
@@ -649,19 +663,6 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             videoLessonGroupLogService.insert(videoLessonGroupLog);
         }
 
-        //修改课程组记录
-        lessonGroup.setAuditVersion(YesOrNoEnum.NO);
-        lessonGroup.setAuditStatus(AuthStatusEnum.DOING);
-
-        if (lessonGroup.getDraftFlag().equals(YesOrNoEnum.YES)) {
-            lessonGroup.setAuditStatus(AuthStatusEnum.PASS);
-            lessonGroup.setShelvesFlag(0);
-        }
-        lessonGroup.setUpdateTime(date);
-        videoLessonGroupDao.updateById(lessonGroup);
-
-        // 设置关联曲目
-        courseMusicAlbumRelation(lessonList,lessonGroup.getId());
         //刷新统计
         VideoLessonGroupUpVo groupUpVo = new VideoLessonGroupUpVo();
         groupUpVo.setId(lessonGroup.getId());

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

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.valid.impl.ValidList;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.Valid;
 
@@ -15,11 +16,22 @@ import javax.validation.Valid;
  */
 @ApiModel(value = "VideoLessonVo")
 public class VideoLessonVo extends BaseEntity {
+
+    @ApiModelProperty(value = "操作人",hidden = true)
+    private Long userBy;
     @Valid
     private VideoLessonGroup lessonGroup;
 
     private ValidList<@Valid VideoLessonGroupDetailDto> lessonList;
 
+    public Long getUserBy() {
+        return userBy;
+    }
+
+    public void setUserBy(Long userBy) {
+        this.userBy = userBy;
+    }
+
     public VideoLessonGroup getLessonGroup() {
         return lessonGroup;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/course/CourseRelationWrapper.java

@@ -1,8 +1,10 @@
 package com.yonge.cooleshow.biz.dal.wrapper.course;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.RelationMusicAlbumEnum;
 import io.swagger.annotations.ApiModel;
@@ -47,6 +49,10 @@ public class CourseRelationWrapper {
         @ApiModelProperty("关联类型, MUSIC, ALBUM ")
         private RelationMusicAlbumEnum relationType;
 
+
+        @ApiModelProperty("关联类型,RECOMMEND:推荐  GIFT:赠品 ")
+        private CourseRelationTypeEnum useRelationType;
+
         @ApiModelProperty("关联曲目专辑ID ")
         private Long musicAlbumId;
 

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

@@ -140,6 +140,7 @@ public class VideoLessonGroupController extends BaseController {
         if (sysUser == null || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
+        lessonVo.setUserBy(sysUser.getId());
         if (CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }
@@ -215,6 +216,7 @@ public class VideoLessonGroupController extends BaseController {
         if (sysUser == null || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
+        lessonVo.setUserBy(sysUser.getId());
         if (CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }

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

@@ -116,6 +116,7 @@ public class VideoGroupController extends BaseController {
         if (sysUser == null||sysUser.getId()==null) {
             return failed("用户信息获取失败");
         }
+        lessonVo.setUserBy(sysUser.getId());
         if ( CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }
@@ -147,6 +148,7 @@ public class VideoGroupController extends BaseController {
         if (sysUser == null||sysUser.getId()==null) {
             return failed("用户信息获取失败");
         }
+        lessonVo.setUserBy(sysUser.getId());
         if ( CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }

service.md

@@ -1,6 +1,6 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [x] admin-server
+- [ ] admin-server
 - [ ] teacher-server
 - [ ] student-server
 - [ ] website-server