fix:修改推荐为赠送

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

@@ -249,8 +249,7 @@ public class MusicAlbumController extends BaseController {
      * 学生详情-乐谱
      */
     @PostMapping(value = "/student", consumes="application/json", produces="application/json")
-    @ApiOperation(value = "学生详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/student')")
+    @ApiOperation(value = "学生详情-专辑", httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<StudentMusicAlbumOrderVo>> student(@Valid @RequestBody StudentMusicSheetOrderSearch query) {
         return succeed(PageUtil.pageInfo(musicAlbumService.selectStudentOrderPage(PageUtil.getPage(query),query)));
     }

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

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.CourseRelationQueryInfo;
@@ -204,6 +205,10 @@ public class VideoLessonController extends BaseController {
         if (shelvesVo.getShelvesFlag() == 0 && StringUtil.isEmpty(shelvesVo.getShelvesReason())) {
             return failed( "下架必须要有下架原因");
         }
+        VideoLessonGroup videoLessonGroup = lessonGroupService.getById(shelvesVo.getId());
+        if (videoLessonGroup.getAuditStatus() ==null || !videoLessonGroup.getAuditStatus().equals(AuthStatusEnum.PASS)) {
+            return failed("审核通过才能上架");
+        }
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentMusicSheetOrderSearch.java

@@ -25,13 +25,13 @@ public class StudentMusicSheetOrderSearch extends QueryInfo {
     @NotNull(message = "学生编号不能为空")
     private Long studentId;
 
-    @ApiModelProperty("曲目编号/名称")
+    @ApiModelProperty("编号/名称")
     private String idAndName;
 
     @ApiModelProperty("订单号")
     private String orderNo;
 
-    @ApiModelProperty("曲目标签id，多个逗号隔开")
+    @ApiModelProperty("标签id，多个逗号隔开")
     private String musicTagIds;
 
     @ApiModelProperty(hidden = true)

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

@@ -16,6 +16,7 @@ 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.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.CourseRelationQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CourseRelationMusicAlbumService;
@@ -297,7 +298,13 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                 courseRelationMusicAlbum.setCourseId(videoLessonGroupDetailDto.getId());
                 courseRelationMusicAlbum.setCourseType(CourseTypeEnum.VIDEO);
                 courseRelationMusicAlbum.setMusicAlbumId(courseMusicAlbumRelationDto.getMusicAlbumId());
-                courseRelationMusicAlbum.setDelFlog(1);
+                if (courseRelationMusicAlbum.getUseRelationType() != null
+                        && courseRelationMusicAlbum.getUseRelationType().equals(CourseRelationTypeEnum.RECOMMEND)
+                        && courseMusicAlbumRelationDto.getUseRelationType().equals(CourseRelationTypeEnum.GIFT)) {
+                    courseRelationMusicAlbum.setDelFlog(2);
+                } else {
+                    courseRelationMusicAlbum.setDelFlog(1);
+                }
                 courseRelationMusicAlbum.setRelationType(courseMusicAlbumRelationDto.getRelationMusicAlbum());
                 courseRelationMusicAlbum.setUseRelationType(courseMusicAlbumRelationDto.getUseRelationType());
                 courseRelationMusicAlbum.setUpdateBy(userBy);

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

@@ -13,16 +13,16 @@ import java.util.Date;
  */
 public class StudentMusicAlbumOrderVo {
 
-    @ApiModelProperty(value = "曲谱id")
+    @ApiModelProperty(value = "专辑id")
     private Long  musicAlbumId;
 
-    @ApiModelProperty(value = "曲谱名称")
+    @ApiModelProperty(value = "专辑名称")
     private String musicAlbumName;  //曲谱名称
 
     @ApiModelProperty(value = "封面图")
     private String titleImg;  //曲谱名称
 
-    @ApiModelProperty("曲目分类名")
+    @ApiModelProperty("专辑分类名")
     private String TagNames;
 
     @ApiModelProperty(value = "支付金额")

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

@@ -399,6 +399,7 @@
 			g.audit_name_ AS auditName,
 			g.audit_status_ AS auditStatus,
 			g.audit_version_ as auditVersion,
+			g.remarks as remarks,
 			s.name_ AS subjectName,
 			t.username_ AS teacherName,
 			t.real_name_ AS realName,