Merge branch 'dev_20221102'

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

@@ -112,6 +112,7 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
 
         // 1.判断曲目启用
         for (CourseCoursewareVo record : records) {
+            record.setStatus(YesOrNoEnum.NO);
             if (record.getMusicStatus().equals(YesOrNoEnum.NO)) {
                 record.setStatus(YesOrNoEnum.NO);
             }
@@ -202,7 +203,9 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
         }
 
         if (detail.getPlay().equals(YesOrNoEnum.NO)) {
-            if (detail.getPaymentType().contains("VIP")) {
+            if (detail.getPaymentType().contains("VIP") && detail.getPaymentType().contains("CHARGE")) {
+                throw new BizException("请先开通会员或购买曲目");
+            } else if (detail.getPaymentType().contains("VIP")) {
                 throw new BizException("请先开通会员");
             } else if (detail.getPaymentType().contains("CHARGE")) {
                 throw new BizException("请先购买曲目");