导入问题修改

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

@@ -17,4 +17,6 @@ public interface TempLiveTeacherCardDao extends BaseDAO<Integer, TempLiveTeacher
 
     List<Subject> querySubjectOption();
 
+    //0 没有购买商品 1 购买商品后没有加入群聊 2 已经加入群聊
+    Integer getJoinStstus(@Param("userId") Integer userId, @Param("goodsId") Integer goodsId);
 }

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

@@ -149,4 +149,18 @@
         )
         order by t.id_
     </select>
+
+    <select id="getJoinStstus" resultType="java.lang.Integer">
+        select case when
+            (
+                select count(1) from temp_buy_free_live_theory_course
+                where user_id_ = #{userId} and live_goods_id_ = #{goodsId}
+            ) = 0 then 0
+            when (
+                select count(1) from temp_live_teacher_card a
+                left join im_group_member b on a.im_group_id_ = b.im_group_id_
+                where a.live_goods_id_ = #{goodsId} and b.user_id_ = #{userId}
+            ) = 0 then 1 else 2 end
+        from dual
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/TempLiveActivityController.java

@@ -44,18 +44,22 @@ public class TempLiveActivityController extends BaseController {
     private TempLiveTeacherCardDao tempLiveTeacherCardDao;
 
     @ApiOperation("查询声部")
-    @PostMapping(value = "/querySubjectOption",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public HttpResponseResult<Map<String,Object>> querySubjectOption() {
+    @PostMapping(value = "/querySubjectOption", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public HttpResponseResult<Map<String, Object>> querySubjectOption() {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || user.getId() == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        Map<String,Object> res = new HashMap<>();
+        Map<String, Object> res = new HashMap<>();
         List<Subject> options = tempLiveTeacherCardDao.querySubjectOption();
-        res.put("options",options);
+        res.put("options", options);
 
         Student student = studentService.get(user.getId());
-        res.put("subjectId",student.getSubjectIdList());
+        res.put("subjectId", student.getSubjectIdList());
+
+        Integer goodsId = 4;
+        Integer ststus = tempLiveTeacherCardDao.getJoinStstus(user.getId(), goodsId);
+        res.put("ststus", ststus);
         return succeed(res);
     }
 
@@ -67,7 +71,7 @@ public class TempLiveActivityController extends BaseController {
             )
     })
     @ApiOperation("查询声部上课老师名片信息列表")
-    @PostMapping(value = "/listTeacherCard",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @PostMapping(value = "/listTeacherCard", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public HttpResponseResult<List<TempLiveTeacherCard>> listTeacherCard(@ApiIgnore @RequestBody TempLiveTeacherCard param) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || user.getId() == null) {

mec-web/src/main/resources/columnMapper.ini

@@ -67,7 +67,7 @@
 ID = id
 用户ID = userId
 购买学生姓名 = studentName
-老师推荐级别（初级/中级/高级） = recommendLevel
+老师推荐级别（一级/二级/三级） = recommendLevel
 
 [直播临时活动上课老师名片导入模板]
 声部id = subjectId