Merge remote-tracking branch 'origin/feature/1022_vip' into feature/1022_vip

# Conflicts:
#	mec-application/src/main/java/com/ym/mec/student/controller/MemberRankController.java

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dao.MemberRankOrganizationFeeMapperDao;
 import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
 import com.ym.mec.biz.dal.dto.MemberPayParamDto;
 import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
+import com.ym.mec.biz.dal.entity.LessonCourseware;
 import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
@@ -46,6 +47,9 @@ public class MemberRankController extends BaseController {
     @Autowired
     private SysMusicScoreDao sysMusicScoreDao;
 
+    @Autowired
+    private LessonCoursewareService lessonCoursewareService;
+
     @ApiOperation(value = "获取所有的收费标准")
     @GetMapping("/queryList")
     public Object getMemberDefaultFee(String  type,Integer  typeId) {
@@ -59,6 +63,12 @@ public class MemberRankController extends BaseController {
             if (sysMusicScore != null) {
                 typeId = sysMusicScore.getCbsMusicCategoriesId();
             }
+        } else if (StringUtils.isNotBlank(type)&& "LESSON".equals(type) && typeId !=null) {
+            // 远程ID 换课件ID
+            LessonCourseware courseware = lessonCoursewareService.getByLessonCoursewareId(typeId.longValue());
+            if (courseware != null) {
+                typeId = courseware.getId();
+            }
         }
         List<Integer> memberIds = feeMappers.stream()
                 .map(MemberRankOrganizationFeeMapper::getMemberRankSettingId).distinct().collect(Collectors.toList());