酷乐秀优化

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

@@ -1,65 +1,41 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.yonge.cooleshow.biz.dal.dto.CourseMusicAlbumRelationDto;
-import com.yonge.cooleshow.biz.dal.entity.CourseRelationMusicAlbum;
-import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.course.RelationMusicAlbumEnum;
-import com.yonge.cooleshow.biz.dal.service.CourseRelationMusicAlbumService;
-import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.wrapper.course.CourseRelationWrapper;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
-import org.apache.commons.collections.CollectionUtils;
-import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDetailDto;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
+import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDetailDto;
 import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 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.Teacher;
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupLog;
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
+import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.service.UserOrderService;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupLogService;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailUpVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupUpVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentVo;
+import com.yonge.cooleshow.biz.dal.enums.course.RelationMusicAlbumEnum;
+import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.biz.dal.wrapper.course.CourseRelationWrapper;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.utils.json.JsonUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * VideoLessonGroupDetailService服务实现类ø
@@ -72,28 +48,25 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
 
     private final static Logger log = LoggerFactory.getLogger(VideoLessonGroupDetailServiceImpl.class);
 
-    @Autowired
+    @Resource
     private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
-    @Autowired
+    @Resource
     private VideoLessonGroupDao videoLessonGroupDao;
-    @Autowired
+    @Resource
     private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
-    @Autowired
+    @Resource
     private UserOrderService orderService;
-    
-    @Autowired
+    @Resource
     private VideoLessonGroupLogService videoLessonGroupLogService;
-    
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
-
-    @Autowired
+    @Resource
     private TeacherService teacherService;
-    @Autowired
-    private CourseRelationMusicAlbumService courseRelationMusicAlbumService;
-    @Autowired
+    @Resource
+    private SubjectService subjectService;
+    @Resource
     private MusicSheetService musicSheetService;
-    @Autowired
+    @Resource
     private MusicAlbumService musicAlbumService;
 
     public VideoLessonGroupDetailDao getDao() {
@@ -224,6 +197,10 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
         	videoLessonGroupVo.setRealName(sysUser.getRealName());
         	videoLessonGroupVo.setAvatar(sysUser.getAvatar());
         }
+        if (StringUtils.isNotEmpty(videoLessonGroupVo.getLessonSubject())){
+            List<Subject> subjectList = subjectService.findBySubjectByIdList(videoLessonGroupVo.getLessonSubject());
+            videoLessonGroupVo.setLessonSubjectName(subjectList.stream().map(Subject::getName).collect(Collectors.joining(",")));
+        }
         
         List<VideoLessonPurchaseRecord> videoLessonPurchaseRecordList = videoLessonPurchaseRecordDao.queryByVideoLessonGroupId(videoLessonGroupLog.getVideoLessonGroupId(), OrderStatusEnum.PAID.getCode());
         if (videoLessonGroupVo.getLessonPrice().compareTo(BigDecimal.ZERO) == 0) {