Merge branch 'feature/1015-cbs-music' of http://git.dayaedu.com/yonge/mec into feature/1015-cbs-music

mec-application/src/main/java/com/ym/mec/student/controller/MusicSheetController.java

@@ -66,7 +66,9 @@ public class MusicSheetController {
         if (detail == null) {
             musicSheetDetail.setBizMusicCategoryId(null);
         } else {
-            //musicSheetDetail.setPaymentType(detail.get());
+            // 设置曲目付费类型
+            musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
+            // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
         }
 

mec-application/src/main/java/com/ym/mec/student/controller/open/OpenMusicSheetController.java

@@ -60,7 +60,9 @@ public class OpenMusicSheetController {
         if (detail == null) {
             musicSheetDetail.setBizMusicCategoryId(null);
         } else {
-            //musicSheetDetail.setPaymentType(detail.get());
+            // 设置曲目付费类型
+            musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
+            // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
         }
 

mec-application/src/main/java/com/ym/mec/teacher/controller/MusicSheetController.java

@@ -72,7 +72,9 @@ public class MusicSheetController {
         if (detail == null) {
             musicSheetDetail.setBizMusicCategoryId(null);
         } else {
-            //musicSheetDetail.setPaymentType(detail.get());
+            // 设置曲目付费类型
+            musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
+            // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
         }
 

mec-application/src/main/java/com/ym/mec/teacher/controller/open/OpenMusicSheetController.java

@@ -60,7 +60,9 @@ public class OpenMusicSheetController {
         if (detail == null) {
             musicSheetDetail.setBizMusicCategoryId(null);
         } else {
-            //musicSheetDetail.setPaymentType(detail.get());
+            // 设置曲目付费类型
+            musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
+            // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
         }
 

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetController.java

@@ -62,7 +62,9 @@ public class MusicSheetController {
         if (detail == null) {
             musicSheetDetail.setBizMusicCategoryId(null);
         } else {
-            //musicSheetDetail.setPaymentType(detail.get());
+            // 设置曲目付费类型
+            musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
+            // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
         }
 

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenMusicSheetController.java

@@ -60,7 +60,9 @@ public class OpenMusicSheetController {
         if (detail == null) {
             musicSheetDetail.setBizMusicCategoryId(null);
         } else {
-            //musicSheetDetail.setPaymentType(detail.get());
+            // 设置曲目付费类型
+            musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
+            // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
         }