Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-service into develop

app/Helper/helper.php

@@ -120,3 +120,12 @@ function http($url, $param, $method = 'post')
     );
     return $response;
 }
+
+function subtext($text, $length)
+{
+    if(mb_strlen($text, 'utf8') > $length) {
+        return mb_substr($text, 0, $length, 'utf8').'...';
+    } else {
+        return $text;
+    }
+}

app/Repositories/PostRepositories.php

@@ -31,6 +31,7 @@ class PostRepositories
     {
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
         $where = [];
+        $where[] = ['is_hide', 0];
         if(isset($request['content'])){
             $where[] = ['content', 'like', "%{$request['content']}%"];
         }
@@ -45,11 +46,6 @@ class PostRepositories
             $where[] = ['uid', $request['uid']];
         }
 
-        $sort = 'post.id';
-        if(isset($request['sort']) && in_array($request['sort'], ['praise_count', 'share_count', 'pv', 'comment_count', 'create_bean'])){
-            $sort = $request['sort'];
-        }
-
         return $this->post
             ->join('post_data', 'post_data.post_id', '=', 'post.id')
             ->select('post.*')
@@ -86,7 +82,7 @@ class PostRepositories
                     }
                 }
             })
-            ->orderBy($sort,'desc')
+            ->orderBy('weight','desc')
             ->paginate($perPage);
     }
 

app/Transformers/Post/SuggestTransformer.php

@@ -19,6 +19,21 @@ class SuggestTransformer extends TransformerAbstract
         return [
             'type' => 0,
             'id' => $post['id'],
+            'created_at' => Carbon::parse($post['created_at'])->toDateTimeString(),
+            'uid' => $post['uid'],
+            'username' => $post['username'],
+            'avatar' => $post['avatar'],
+            'topic' => $post->topic(),
+            'content' => subtext($post['content'], 20),
+            'location' => $post['location'],
+            'pv' => $post->data->pv,
+            'praise_count' => $post->data->praise_count,
+            'share_count' => $post->data->share_count,
+            'comment_count' => $post->data->comment_count,
+            'collect_count' => $post->data->collect_count,
+            'create_bean' => $post->data->create_bean,
+            'is_suggest' => $post['is_suggest'],
+            'is_hide' => $post['is_hide'],
         ];
     }
 }