add userCollection

app/controller/course/institutionSub.js

@@ -4,9 +4,7 @@ const Controller = require('egg').Controller;
 
 class InstitutionSubController extends Controller {
 
-  /**
-     * 机构列表
-     */
+  //机构列表
   async getInstitutions() {
 
     const { ctx } = this;
@@ -16,9 +14,7 @@ class InstitutionSubController extends Controller {
     ctx.success(ret);
   }
 
-  /**
-     * 机构详情
-     */
+  //机构详情
   async getInstitution() {
 
     const { ctx } = this;
@@ -140,7 +136,14 @@ class InstitutionSubController extends Controller {
     ctx.success(ret);
   }
 
+  //用户收藏机构列表
+  async getUserCollectedInstitutions() {
+    const { ctx, service } = this;
+    const inputParams = ctx.request.query;
+    const ret = await service.course.institutionSub.getUserCollectedInstitutions(inputParams);
 
+    ctx.success(ret);
+  }
 }
 
 module.exports = InstitutionSubController;

app/model/class/course_institution.js

@@ -17,7 +17,7 @@ module.exports = app => {
     },
     name: STRING,
     type: STRING,
-    // image: STRING,
+    open_time: STRING,
     establishment_time: STRING,
     class_type: STRING,
     teacher_count: INTEGER,

app/router/course.js

@@ -52,7 +52,7 @@ module.exports = app => {
   router.post('third', '/sub/user/baby', miniAuth, 'course.user.saveBabyInfo');// 保存baby信息
   router.delete('third', '/sub/user/baby', miniAuth, 'course.user.delBabyInfo');// 删除baby信息
 
-  router.get('third', '/sub/user/collection/institution', miniAuth, 'course.user.getCollectInstitutions');// 收藏的机构列表
+  router.get('third', '/sub/user/collection/institution', miniAuth, 'course.institutionSub.getUserCollectedInstitutions');// 收藏的机构列表
   router.post('third', '/sub/user/collection/institution', miniAuth, 'course.user.collectInstitution');// 收藏机构
   router.delete('third', '/sub/user/collection/institution', miniAuth, 'course.user.delCollectInstitution');// 取消收藏机构
 

app/service/course/institutionSub.js

@@ -307,7 +307,7 @@ class InstitutionSubService extends Service {
 
     // 用户已收藏机构列表
     const userInstitutions = await ctx.classModel.CourseUserCollection.findAll({ where: { is_deleted: 0, user_uuid: userUuid } });
-    const userInstitutionIds = R.pluck('id', userInstitutions);
+    const userInstitutionIds = R.pluck('institution_id', userInstitutions);
 
     // 机构图片及格式化
     for (const i in institutionList) {
@@ -638,7 +638,18 @@ class InstitutionSubService extends Service {
   }
 
 
-  //
+  //用户收藏机构列表
+  async getUserCollectedInstitutions(input) {
+    const { ctx } = this;
+    const userUuid = ctx.userUuid;
+
+    const userCollection = await ctx.classModel.CourseUserCollection.findAll({where: {user_uuid: userUuid, is_deleted: 0}, raw: true});
+    const institutionIds = R.pluck('institution_id', userCollection);
+    const institutionList = await ctx.classModel.CourseInstitution.findAll({where: {id: {$in: institutionIds}, status: 'online', is_deleted:0}, raw: true});
+
+    const ret = await this.formatInstitutionList(institutionList, input);
+    return ret;
+  }
 }
 
 module.exports = InstitutionSubService;