merge

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumSheetController.java

@@ -62,8 +62,8 @@ public class TenantAlbumSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setUserId(sysUser.getId());
-        LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto= tenantAlbumMusicService.getLessonCoursewareDetail(query);
-        return succeed(lessonCoursewareDto);
+        LessonCoursewareWrapper.LessonCourseware lessonCourseware = tenantAlbumMusicService.getLessonCoursewareDetail(query);
+        return succeed(lessonCourseware);
     }
 
     @ApiOperation(value = "获取课件关联的课程列表")

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TenantAlbumSheetController.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.student.controller;
 
-import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
@@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * 专辑表 web 控制层
@@ -110,8 +108,8 @@ public class TenantAlbumSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setUserId(sysUser.getId());
-        LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto= tenantAlbumMusicService.getLessonCoursewareDetail(query);
-        return succeed(lessonCoursewareDto);
+        LessonCoursewareWrapper.LessonCourseware lessonCourseware = tenantAlbumMusicService.getLessonCoursewareDetail(query);
+        return succeed(lessonCourseware);
     }
 
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * 专辑表 web 控制层
@@ -81,8 +80,8 @@ public class TenantAlbumSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setUserId(sysUser.getId());
-        LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto= tenantAlbumMusicService.getLessonCoursewareDetail(query);
-        return succeed(lessonCoursewareDto);
+        LessonCoursewareWrapper.LessonCourseware lessonCourseware = tenantAlbumMusicService.getLessonCoursewareDetail(query);
+        return succeed(lessonCourseware);
     }
 
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumSheetController.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * 专辑表 web 控制层
@@ -89,8 +88,8 @@ public class TenantAlbumSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setUserId(sysUser.getId());
-        LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto= tenantAlbumMusicService.getLessonCoursewareDetail(query);
-        return succeed(lessonCoursewareDto);
+        LessonCoursewareWrapper.LessonCourseware lessonCourseware = tenantAlbumMusicService.getLessonCoursewareDetail(query);
+        return succeed(lessonCourseware);
     }
 
 

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

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
 import com.yonge.cooleshow.biz.dal.wrapper.LessonCoursewareWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper;

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

@@ -355,27 +355,28 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         if (lessonCourseware == null) {
             throw new BizException("课件不存在");
         }
+
         LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto = JSON.parseObject(JSON.toJSONString(lessonCourseware), LessonCoursewareWrapper.LessonCourseware.class);
-        lessonCoursewareDto.setStatus(false);
+        lessonCoursewareDto.setPlay(false);
 
         if (query.getClient() == ClientEnum.STUDENT) {
             // 判断学生有咩有购买
             if (query.getAlbumId() != null) {
                 UserTenantAlbumRecord albumRecord = userTenantAlbumRecordService.getNewestByTenantAlbumId(query.getAlbumId(), query.getUserId(), query.getClient());
                 if (albumRecord != null && albumRecord.getEndTime().after(new Date())) {
-                    lessonCoursewareDto.setStatus(true);
+                    lessonCoursewareDto.setPlay(true);
                 }
             } else {
                 List<Long> useAlbumIdsByUserId = userTenantAlbumRecordService.getUseAlbumIdsByUserId(query.getUserId(), query.getClient());
                 if (CollectionUtils.isNotEmpty(useAlbumIdsByUserId)) {
                     List<Long> list = tenantAlbumMusicService.getTenantAlbumMusicIdsByIds(useAlbumIdsByUserId, Arrays.asList(SubjectTypeEnum.COURSEWARE));
                     if (list.contains(query.getLessonCoursewareId())) {
-                        lessonCoursewareDto.setStatus(true);
+                        lessonCoursewareDto.setPlay(true);
                     }
                 }
             }
         } else {
-            lessonCoursewareDto.setStatus(true);
+            lessonCoursewareDto.setPlay(true);
         }
 
         return lessonCoursewareDto;

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

@@ -12,7 +12,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -77,7 +76,7 @@ public class LessonCoursewareWrapper {
     public static class LessonCourseware extends CbsLessonCoursewareWrapper.LessonCourseware {
 
         @ApiModelProperty("是否生效中")
-        private Boolean status = false;
+        private Boolean play = false;
 
     }