曲目播放付费方式判断更换

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

@@ -261,7 +261,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             String reason = musicSheetAuthRecordService.selectAuditReason(id);
             detail.setReason(reason);
         }
-        if (ChargeTypeEnum.FREE.getCode().equals(detail.getChargeType().getCode())) {
+        if (detail.getPaymentType().contains(ChargeTypeEnum.FREE.getCode())) {
             detail.setPlay(YesOrNoEnum.YES);
         } else if (ClientEnum.STUDENT.getCode().equals(userType.getCode())
                 || ClientEnum.TEACHER.getCode().equals(userType.getCode())) {
@@ -293,7 +293,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     private void setMusicSheetPlay(Long studentId, MusicSheetDetailVo detail, ClientEnum userType) {
         detail.setPlay(YesOrNoEnum.NO);
         // 单曲购买 判断购买记录，有记录课播放
-        if (ChargeTypeEnum.CHARGE.getCode().equals(detail.getChargeType().getCode())) {
+        if (detail.getPaymentType().contains(ChargeTypeEnum.CHARGE.getCode())) {
             // 学生须判断是否能播放曲目
             MusicSheetPurchaseRecord musicSheetPurchaseRecord = musicSheetPurchaseRecordService.checkPurchase(
                     studentId, detail.getId(), userType, PurchaseRecordTypeEnum.MUSIC);
@@ -302,9 +302,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 detail.setOrderNo(musicSheetPurchaseRecord.getOrderNo());
                 if (OrderStatusEnum.PAID.getCode().equals(musicSheetPurchaseRecord.getOrderStatus().getCode())) {
                     detail.setPlay(YesOrNoEnum.YES);
+                    return;
                 }
             }
-        } else if (ChargeTypeEnum.VIP.getCode().equals(detail.getChargeType().getCode())) {
+        }
+        if (detail.getPaymentType().contains(ChargeTypeEnum.VIP.getCode())) {
             // 先判断是否购买过
             MusicSheetPurchaseRecord musicSheetPurchaseRecord = musicSheetPurchaseRecordService.checkPurchase(
                     studentId, detail.getId(), userType, PurchaseRecordTypeEnum.MUSIC);