Merge branch 'dev_v1.3.7_20221020'

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -329,10 +330,21 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
             return iPage;
         }
         List<MusicAlbumVo> favoriteNumAndMusicNumList =baseMapper.selectFavoriteNumAndMusicNum(records);
+        Map<Long, List<MusicAlbumVo>> collect = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(favoriteNumAndMusicNumList)) {
+            collect = favoriteNumAndMusicNumList.stream().collect(Collectors.groupingBy(
+                                                                                      MusicAlbumVo::getId));
+        }
 
-        for (int i = 0; i < records.size(); i++) {
-            records.get(i).setAlbumFavoriteCount(favoriteNumAndMusicNumList.get(i).getAlbumFavoriteCount());
-            records.get(i).setMusicSheetCount(favoriteNumAndMusicNumList.get(i).getMusicSheetCount());
+        for (MusicAlbumVo record : records) {
+            List<MusicAlbumVo> musicAlbumVos = collect.get(record.getId());
+            if (CollectionUtils.isNotEmpty(musicAlbumVos)) {
+                record.setAlbumFavoriteCount(musicAlbumVos.get(0).getAlbumFavoriteCount());
+                record.setAlbumFavoriteCount(musicAlbumVos.get(0).getMusicSheetCount());
+            } else {
+                record.setAlbumFavoriteCount(0);
+                record.setMusicSheetCount(0);
+            }
         }
         return iPage;
     }

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

@@ -322,11 +322,12 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                 courseRelationMusicAlbum.setCourseId(videoLessonGroupDetailDto.getId());
                 courseRelationMusicAlbum.setCourseType(CourseTypeEnum.VIDEO);
                 courseRelationMusicAlbum.setMusicAlbumId(courseMusicAlbumRelationDto.getMusicAlbumId());
+                // 推荐该赠送
                 if (courseRelationMusicAlbum.getUseRelationType() != null
                         && courseRelationMusicAlbum.getUseRelationType().equals(CourseRelationTypeEnum.RECOMMEND)
                         && courseMusicAlbumRelationDto.getUseRelationType().equals(CourseRelationTypeEnum.GIFT)) {
                     courseRelationMusicAlbum.setDelFlog(2);
-                } else {
+                } else if (courseRelationMusicAlbum.getDelFlog() == null) {
                     courseRelationMusicAlbum.setDelFlog(1);
                 }
                 courseRelationMusicAlbum.setRelationType(courseMusicAlbumRelationDto.getRelationMusicAlbum());

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

@@ -436,7 +436,7 @@
 				<![CDATA[AND g.create_time_ <= #{param.endTime} ]]>
 			</if>
 		</where>
-		ORDER BY g.id_ desc
+		ORDER BY g.update_time_ desc, g.id_ desc
 	</select>
 
 	<select id="queryGroupHistoryList" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonAuthGroup">