liujunchi преди 2 години
родител
ревизия
3e2293e38a

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

@@ -348,7 +348,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             // 先判断是否购买过
             MusicSheetPurchaseRecord musicSheetPurchaseRecord = musicSheetPurchaseRecordService.checkPurchase(
                     studentId, detail.getId(), userType, PurchaseRecordTypeEnum.MUSIC);
-            if (musicSheetPurchaseRecord != null) {
+            if (musicSheetPurchaseRecord != null && OrderStatusEnum.PAID.getCode().equals(musicSheetPurchaseRecord.getOrderStatus().getCode())) {
                 detail.setPlay(YesOrNoEnum.YES);
             } else
             // 会员 判断是否为会员, 会员可播放

+ 2 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -171,8 +171,8 @@
     <select id="selectFavoriteNumAndMusicNum" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
         select
         t.id_ as id,
-        t1.num as musicSheetCount
-        ,t2.num as albumFavoriteCount
+        ifnull(t1.num,0) as musicSheetCount
+        ,ifnull(t2.num,0) as albumFavoriteCount
         from music_album t
         left join (select count(1) as num,amr.album_id_
             from album_music_relate amr