Merge branch 'dev_vn_20221117' into ponline

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

@@ -163,7 +163,6 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
 
         List<MusicSheetVo> records = musicSheetVoIPage.getRecords();
         if (CollectionUtils.isNotEmpty(records)) {
-
             // 专辑曲目付费方式
             List<String> paymentTypes = musicSheetVoIPage.getRecords().stream()
                     .flatMap(x -> Arrays.stream(x.getPaymentType().split(","))).distinct().collect(Collectors.toList());

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

@@ -477,6 +477,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
      * @return List<MusicSheetVo>
      */
     public List<MusicSheetVo> updateMusicAlbumNumInfo(List<MusicSheetVo> records) {
+        for (MusicSheetVo record : records) {
+            // 设置收藏人数
+            record.setFavoriteCount(record.getFavoriteCount() + record.getVirtualNumber());
+        }
         List<Long> musicIds = records.stream()
                 .map(MusicSheet::getId).distinct().collect(Collectors.toList());
 

service.md

@@ -3,7 +3,7 @@
 - [x] admin-server
 - [x] teacher-server
 - [x] student-server
-- [ ] website-server
+- [x] website-server
 - [x] task-server
 - [ ] websocket-server
 - [ ] audio-analysis