Merge branch 'zouxuan_saas_2022_0606' into master_saas

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

@@ -19,4 +19,7 @@ public interface TempLiveTeacherCardDao extends BaseDAO<Integer, TempLiveTeacher
 
     //0 没有购买商品 1 购买商品后没有加入群聊 2 已经加入群聊
     Integer getJoinStstus(@Param("userId") Integer userId, @Param("goodsId") Integer goodsId);
+
+    //查询学生加入的群聊所在的声部
+    String getJoinSubject(@Param("userId") Integer userId, @Param("goodsId") Integer goodsId);
 }

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

@@ -163,4 +163,10 @@
             ) = 0 then 1 else 2 end
         from dual
     </select>
+    <select id="getJoinSubject" resultType="java.lang.String">
+        select subject_id_ 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}
+        limit 1;
+    </select>
 </mapper>

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

@@ -60,6 +60,10 @@ public class TempLiveActivityController extends BaseController {
         Integer goodsId = 4;
         Integer ststus = tempLiveTeacherCardDao.getJoinStstus(user.getId(), goodsId);
         res.put("ststus", ststus);
+
+        String joinSubjectId = tempLiveTeacherCardDao.getJoinSubject(user.getId(),goodsId);
+        res.put("joinSubjectId", joinSubjectId);
+
         return succeed(res);
     }