酷乐秀曲目来源改为内容平台

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

@@ -1,23 +1,18 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
-import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
-import com.yonge.cooleshow.biz.dal.vo.StudentMusicAlbumOrderVo;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.enums.ActivityShareEnum;
@@ -39,9 +34,6 @@ import com.yonge.cooleshow.biz.dal.dto.MusicAlbumSheetSortDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
@@ -144,22 +136,6 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         // 新增专辑曲目查询条件
         if (query.getType() != null && query.getType() == 1) {
             query.setSubjectIds(musicAlbum.getSubjectId());
-
-            // 判断专辑收费类型；非免费类型，只能添加平台曲目
-            /*if (!ChargeTypeEnum.FREE.match(musicAlbum.getPaymentType())) {
-
-                // 曲目来源
-                query.setSourceType(SourceTypeEnum.PLATFORM);
-                // 曲目收费类型
-                if (musicAlbum.getPaymentType().contains(",")) {
-                    // 多种付费方式
-                    query.setPaymentTypes(Lists.newArrayList(musicAlbum.getPaymentType(), ChargeTypeEnum.FREE.getCode()));
-                } else {
-                    // 单一付费方式
-                    query.setChargeType(ChargeTypeEnum.valueOf(musicAlbum.getPaymentType()));
-                }
-
-            }*/
         }
 
         if (sysUser != null) {
@@ -178,10 +154,16 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
             // 更新曲目专辑数量
             musicSheetService.updateMusicAlbumNumInfo(records);
         }
+        //处理Long精度丢失问题
+        List<MusicSheetVoResult> musicSheetVoResults = new ArrayList<>();
+        for (MusicSheetVo row : records) {
+            MusicSheetVoResult musicSheetVoResult = JSON.parseObject(JSON.toJSONString(row), MusicSheetVoResult.class);
+            musicSheetVoResult.setCbsMusicSheetId(row.getCbsMusicSheetId().toString());
+            musicSheetVoResults.add(musicSheetVoResult);
+        }
+        albumDetailVo.setMusicSheetList(PageUtil.pageInfo(com.yonge.cooleshow.biz.dal.dto.PageUtil.transPageInfo(musicSheetVoIPage, musicSheetVoResults)));
 
 
-        albumDetailVo.setMusicSheetList(PageUtil.pageInfo(musicSheetVoIPage));
-
         albumDetailVo.setMusicSheetCount((int) musicSheetVoIPage.getTotal());
 
         if (sysUser == null) {

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

@@ -35,7 +35,7 @@ public class AlbumDetailVo {
     private YesOrNoEnum favorite;
 
     @ApiModelProperty("专辑详情曲目")
-    private PageInfo<MusicSheetVo> musicSheetList;
+    private PageInfo<MusicSheetVoResult> musicSheetList;
 
     @ApiModelProperty(value = "专辑标签(多个标签以逗号分开)",required = true)
     private String albumTag;  //专辑标签(多个标签以逗号分开)
@@ -195,11 +195,11 @@ public class AlbumDetailVo {
         this.albumName = albumName;
     }
 
-    public PageInfo<MusicSheetVo> getMusicSheetList() {
+    public PageInfo<MusicSheetVoResult> getMusicSheetList() {
         return musicSheetList;
     }
 
-    public void setMusicSheetList(PageInfo<MusicSheetVo> musicSheetList) {
+    public void setMusicSheetList(PageInfo<MusicSheetVoResult> musicSheetList) {
         this.musicSheetList = musicSheetList;
     }