学生会员信息

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

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.google.common.collect.Lists;
 import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -82,6 +83,9 @@ public class StudentManageController extends BaseController {
     @Autowired
     private ImGroupCoreService imGroupCoreService;
 
+    @Autowired
+    private CloudTeacherOrderService cloudTeacherOrderService;
+
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
     @Autowired
@@ -253,6 +257,7 @@ public class StudentManageController extends BaseController {
                 }
             }
         }
+        datas.put("vipInfo", cloudTeacherOrderService.getEffectiveCloudTeacherOrder(Lists.newArrayList(student.getUserId())));
 		return succeed(datas);
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MemberRankSettingDao.java

@@ -13,7 +13,9 @@ public interface MemberRankSettingDao extends BaseDAO<Integer, MemberRankSetting
 
     List<MemberRankSetting> selectBatchIds(@Param("ids") List<Integer> ids);
 
-    List<MemberRankSetting> selectBatchIdsByParentIds(@Param("topIds") List<Integer> topIds);
+    List<MemberRankSetting> getNotDelByParentIds(@Param("topIds") List<Integer> topIds);
 
     void deleteById(@Param("id") Integer id);
+
+    List<MemberRankSetting> getNotDelByIds(@Param("ids") List<Integer> parentIds);
 }

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

@@ -121,7 +121,7 @@ public class MemberRankSettingWrapper {
         private Integer operator;
 
         @ApiModelProperty("是否已被购买")
-        private Boolean buyFlag = false;
+        private Boolean buyFlag;
 
         @ApiModelProperty("子节点")
         private List<MemberRankSetting> children;

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

@@ -1104,11 +1104,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         }
         // 查询上级
         if (CollectionUtils.isNotEmpty(parentIds)) {
-            List<MemberRankSetting> parents = memberRankSettingDao.selectBatchIds(parentIds);
+            List<MemberRankSetting> parents = memberRankSettingDao.getNotDelByIds(parentIds);
             dataList.addAll(parents);
         }
         if (CollectionUtils.isNotEmpty(topIds)) {
-            List<MemberRankSetting> tops = memberRankSettingDao.selectBatchIdsByParentIds(topIds);
+            List<MemberRankSetting> tops = memberRankSettingDao.getNotDelByParentIds(topIds);
 
             dataList.addAll(tops);
         }
@@ -1208,7 +1208,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             throw new BizException("存在学员使用、或销售，不可删除");
         }
         // 判断是否存在子集
-        List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIdsByParentIds(Lists.newArrayList(id));
+        List<MemberRankSetting> memberRankSettings = memberRankSettingDao.getNotDelByParentIds(Lists.newArrayList(id));
         memberRankSettings = memberRankSettings.stream().filter(o -> !o.getDelFlag()).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(memberRankSettings)) {
             throw new BizException("存在子级，不可删除");

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

@@ -132,10 +132,9 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        and del_flag_=0
     </select>
 
-	<select id="selectBatchIdsByParentIds" resultMap="MemberRankSetting">
+	<select id="getNotDelByParentIds" resultMap="MemberRankSetting">
         SELECT * FROM member_rank_setting WHERE parent_id_ IN
         <foreach collection="topIds" item="parentId" open="(" close=")" separator=",">
             #{parentId}
@@ -146,4 +145,12 @@
 	<update id="deleteById">
         UPDATE member_rank_setting SET del_flag_ = 1 WHERE id_ = #{id}
     </update>
+
+	<select id="getNotDelByIds" resultMap="MemberRankSetting">
+        SELECT * FROM member_rank_setting WHERE id_ IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        and del_flag_=0
+    </select>
 </mapper>