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

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

@@ -23,11 +23,11 @@ public class MemberRankSettingController extends BaseController {
 
     @ApiOperation(value = "获取可用的会员树状列表")
     @GetMapping("/queryTree")
-    public HttpResponseResult<List<MemberRankSettingWrapper.MemberRankSetting>> queryTree(String musicGroupId,Integer organId,Integer studentId) {
-        if (musicGroupId == null && organId == null && studentId == null) {
+    public HttpResponseResult<List<MemberRankSettingWrapper.MemberRankSetting>> queryTree(MemberRankSettingWrapper.MemberRankSettingStudentQuery query) {
+        if (query.getMusicGroupId() == null && query.getOrganId() == null && query.getStudentId() == null) {
             return failed("参数错误");
         }
-        return succeed(memberRankSettingService.queryTree(musicGroupId,organId,studentId));
+        return succeed(memberRankSettingService.queryTree(query));
     }
 
 }

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

@@ -89,10 +89,10 @@ public class MemberRankSettingController extends BaseController {
 
     @ApiOperation(value = "获取可用的会员树状列表")
     @GetMapping("/queryTree")
-    public HttpResponseResult<List<MemberRankSettingWrapper.MemberRankSetting>> queryTree(String musicGroupId,Integer organId,Integer studentId) {
-        if (musicGroupId == null && organId == null && studentId == null) {
+    public HttpResponseResult<List<MemberRankSettingWrapper.MemberRankSetting>> queryTree(MemberRankSettingWrapper.MemberRankSettingStudentQuery query) {
+        if (query.getMusicGroupId() == null && query.getOrganId() == null && query.getStudentId() == null) {
             return failed("参数错误");
         }
-        return succeed(memberRankSettingService.queryTree(musicGroupId,organId,studentId));
+        return succeed(memberRankSettingService.queryTree(query));
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MemberRankSettingWrapper.java

@@ -49,6 +49,14 @@ public class MemberRankSettingWrapper {
         @ApiModelProperty("移除ID")
         private List<Integer> removeIds;
 
+
+
+        @ApiModelProperty("类型 MUSIC:曲目，LESSON:课程")
+        private String  type;
+
+        @ApiModelProperty("类型ID")
+        private Integer  typeId;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -160,4 +168,24 @@ public class MemberRankSettingWrapper {
         @ApiModelProperty("学练宝云课堂内容")
         private List<SysMusicScoreCategories> lessonCategories;
     }
+
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" MemberRankSettingQuery-会员等级设置")
+    public static class MemberRankSettingStudentQuery implements QueryInfo {
+        private String musicGroupId;
+        private Integer organId;
+        private Integer studentId;
+
+        @ApiModelProperty("类型 MUSIC:曲目，LESSON:课程")
+        private String  type;
+
+        @ApiModelProperty("类型ID")
+        private Integer  typeId;
+    }
+
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MemberRankSettingService.java

@@ -61,7 +61,7 @@ public interface MemberRankSettingService extends BaseService<Integer, MemberRan
 
     List<MemberRankSetting> listByIds(List<Integer> ids);
 
-    List<MemberRankSettingWrapper.MemberRankSetting> queryTree(String musicGroupId, Integer organId, Integer studentId);
+    List<MemberRankSettingWrapper.MemberRankSetting> queryTree(MemberRankSettingWrapper.MemberRankSettingStudentQuery query);
 
 
     //获取会员全名称

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

@@ -1228,26 +1228,32 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     }
 
     @Override
-    public List<MemberRankSettingWrapper.MemberRankSetting> queryTree(String musicGroupId, Integer organId, Integer studentId) {
-        if(organId == null){
-            if(StringUtils.isNotEmpty(musicGroupId)){
-                MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+    public List<MemberRankSettingWrapper.MemberRankSetting> queryTree(MemberRankSettingWrapper.MemberRankSettingStudentQuery query) {
+        if(query.getOrganId() == null){
+            if(StringUtils.isNotEmpty(query.getMusicGroupId())){
+                MusicGroup musicGroup = musicGroupDao.get(query.getMusicGroupId());
                 if (musicGroup == null) {
                     throw new BizException("乐团不存在");
                 }
-                organId = musicGroup.getOrganId();
-            }else if (studentId != null){
-                SysUser user = studentService.getDao().getUser(studentId);
+                query.setOrganId(musicGroup.getOrganId());
+            }else if (query.getStudentId() != null){
+                SysUser user = studentService.getDao().getUser(query.getStudentId());
                 if (user == null) {
                     throw new BizException("学生不存在");
                 }
-                organId = user.getOrganId();
+                query.setOrganId(user.getOrganId());
             }else {
                 throw new BizException("参数错误");
             }
         }
+        if (StringUtils.isNotBlank(query.getType())&& query.getType().equals("MUSIC") && query.getTypeId() !=null) {
+            SysMusicScore sysMusicScore = sysMusicScoreDao.get(query.getTypeId());
+            if (sysMusicScore != null) {
+                query.setTypeId(sysMusicScore.getCbsMusicCategoriesId());
+            }
+        }
         //获取机构可用会员编号
-        List<MemberRankOrganizationFeeMapper> feeMappers = memberRankOrganizationFeeMapperDao.queryByOrganId(organId);
+        List<MemberRankOrganizationFeeMapper> feeMappers = memberRankOrganizationFeeMapperDao.queryByOrganId(query.getOrganId());
         if (CollectionUtils.isEmpty(feeMappers)) {
             return Lists.newArrayList();
         }
@@ -1255,6 +1261,8 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         MemberRankSettingWrapper.MemberRankSettingQuery queryInfo = new MemberRankSettingWrapper.MemberRankSettingQuery();
         queryInfo.setMemberIds(rankIds);
         queryInfo.setHasChildren(true);
+        queryInfo.setType(query.getType());
+        queryInfo.setTypeId(query.getTypeId());
         return this.queryPage2(queryInfo);
     }
 

mec-biz/src/main/resources/config/mybatis/MemberRankSettingMapper.xml

@@ -64,14 +64,20 @@
 		update_time_ = NOW()
 	</set>WHERE id_ = #{id}
 	</update>
-	
+
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MemberRankSetting" parameterType="map">
-		SELECT mrs.*,su.real_name_ operator_name_ FROM member_rank_setting mrs
-		LEFT JOIN sys_user su ON su.id_ = mrs.operator_
-		<include refid="queryPageSql"/>
-		<include refid="global.limit"/>
-	</select>
+    <select id="queryPage" resultMap="MemberRankSetting" parameterType="map">
+        SELECT mrs.*,su.real_name_ operator_name_ FROM member_rank_setting mrs
+        LEFT JOIN sys_user su ON su.id_ = mrs.operator_
+        <if test="type !=null and type == 'MUSIC'">
+            left join member_rank_category_mapper mrcm on mrs.id_ = mrcm.rank_id_
+        </if>
+        <if test="type !=null and type == 'LESSON'">
+            left join member_rank_course_type_mapper mrctm on mrs.id_ = mrctm.rank_id_
+        </if>
+        <include refid="queryPageSql"/>
+        <include refid="global.limit"/>
+    </select>
 
 	<sql id="queryPageSql">
 		<where>
@@ -79,6 +85,12 @@
 			<if test="search != null and search != ''">
 				AND (mrs.name_ LIKE CONCAT('%',#{search},'%') OR mrs.id_ = #{search})
 			</if>
+            <if test="type !=null and type == 'MUSIC'">
+                and mrcm.category_id_ = #{typeId}
+            </if>
+            <if test="type !=null and type == 'LESSON'">
+                and mrctm.course_type_ = #{typeId}
+            </if>
             <if test="updateStartTime !=null">
                 AND mrs.update_time_ &gt;= #{updateStartTime}
             </if>
@@ -115,6 +127,12 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(mrs.id_) FROM member_rank_setting mrs
         LEFT JOIN sys_user su ON su.id_ = mrs.operator_
+        <if test="type !=null and type == 'MUSIC'">
+            left join member_rank_category_mapper mrcm on mrs.id_ = mrcm.rank_id_
+        </if>
+        <if test="type !=null and type == 'LESSON'">
+            left join member_rank_course_type_mapper mrctm on mrs.id_ = mrctm.rank_id_
+        </if>
 		<include refid="queryPageSql"/>
 	</select>