Merge remote-tracking branch 'origin/develop' into develop

app/Http/Controllers/V1/MemberFollowTopic.php

@@ -63,4 +63,16 @@ class MemberFollowTopic extends Controller {
         $data = $fractal->createData($resource)->toArray();
         return jsonSuccess($data);
     }
+    //获取用户关注话题
+    public function getMemberTopics(Request $request){
+        $data = $request->all();
+        $validator = Validator::make($data, [
+            'uid' => 'required|integer',
+        ]);
+        if ($validator->fails()) {
+            return jsonError($validator->errors()->first());
+        }
+        $data = $this->memberFollowTopicRepository->getMemberTopic($data['uid']);
+        return jsonSuccess($data);
+    }
 }

app/Repositories/MemberFollowTopicRepository.php

@@ -81,4 +81,14 @@ class MemberFollowTopicRepository {
                     ->select('member_follow_topic.id','uid','topic_id','topic.name as topic_name','topic.is_suggest')
                     ->paginate($perPage);
     }
+    //获取用户关注话题
+    public function getMemberTopic($uid){
+        return $this->memberFollowTopic
+            ->leftJoin('topic', 'member_follow_topic.topic_id', '=', 'topic.id')
+            ->where(['member_follow_topic.uid'=>$uid])
+            //->select('member_follow_topic.id','uid','topic_id','topic.name as topic_name','topic.is_suggest')
+            ->select('topic.name as topic_name')
+            ->take(3)
+            ->get();
+    }
 }

routes/api.php

@@ -54,6 +54,8 @@ $api->version('v1', [
         $api->post('memberFollowTopic/follow', 'MemberFollowTopic@followTopic');
         //取消关注
         $api->delete('memberFollowTopic/cancel', 'MemberFollowTopic@cancelFollowTopic');
+        //获取用户关注话题
+        $api->get('memberFollowTopic/getMemberTopic', 'MemberFollowTopic@getMemberTopics');
         //关注话题列表
         $api->get('memberFollowTopic', 'MemberFollowTopic@index');
         //收藏列表