Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into feature/1022_vip

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentLessonTrainingDetailWrapper.java

@@ -116,6 +116,9 @@ public class StudentLessonTrainingDetailWrapper {
         private Boolean validFlag = false;
 
         private String memo;
+
+        @ApiModelProperty("使用状态 锁定： LOCK 解锁：UNLOCK")
+        private String useStatus;
         
         public String jsonString() {
             return JSON.toJSONString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonTrainingDetailServiceImpl.java

@@ -253,7 +253,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
 
                             // 免费曲目也可以直接访问
                             if (StringUtils.isBlank(sysMusicScore.getRankIds())) {
-                                studentLessonTrainingDetail.setValidFlag(true);
+                                studentLessonTrainingDetail.setUseStatus("FREE");
                             }
 
                             // 用户VIP可查看曲目分类
@@ -261,14 +261,14 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
                                 && userVipMap.containsKey(studentLessonTrainingDetail.getUserId().intValue())) {
 
                                 // 设置默认不可以查看
-                                boolean validFlag = false;
                                 List<Integer> categoryIds = userVipMap.get(studentLessonTrainingDetail.getUserId().intValue());
                                 if (categoryIds.contains(sysMusicScore.getCbsMusicCategoriesId())
                                     || StringUtils.isBlank(sysMusicScore.getRankIds())) {
                                     // 免费曲目，已购买曲目可直接查看
-                                    validFlag = true;
+                                    studentLessonTrainingDetail.setUseStatus("UNLOCK");
+                                } else {
+                                    studentLessonTrainingDetail.setUseStatus("LOCK");
                                 }
-                                studentLessonTrainingDetail.setValidFlag(validFlag);
                             }
                             studentLessonTrainingDetail.setMusicScoreName(sysMusicScore.getName());
                         }