Auto stash before merge of "develop" and "origin/develop"

app/Http/Controllers/V1/PostController.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/14
+ * Time: 16:23
+ */
+
+namespace App\Http\Controllers\V1;
+
+use App\Repositories\PostRepositories;
+use App\Transformers\Post\SuggestTransformer;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use League\Fractal\Manager;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection;
+use League\Fractal\Resource\Item;
+
+class PostController extends Controller
+{
+
+    public function __construct(PostRepositories $postRepositories)
+    {
+        $this->postRepositories = $postRepositories;
+    }
+
+    /**
+     * 推荐内容列表
+     */
+    public function suggestPost(Request $request)
+    {
+        $purchaseList = $this->postRepositories->suggestPost($request->all());
+        $fractal = new Manager();
+        $resource = new Collection($purchaseList, new SuggestTransformer());
+        $resource->setPaginator(new IlluminatePaginatorAdapter($purchaseList));
+        $data = $fractal->createData($resource)->toArray();
+        return jsonSuccess($data);
+    }
+}

app/Models/Post.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/5
+ * Time: 16:24
+ */
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Post extends Model
+{
+    //
+    use SoftDeletes;
+    protected $table = 'post';
+    protected $guarded = [];
+
+    public function imgs()
+    {
+        return $this->hasMany('App\Models\PostImgs', 'post_id', 'id');
+    }
+
+    public function data()
+    {
+        return $this->hasOne('App\Models\PostData', 'post_id', 'id');
+    }
+
+    public function topic()
+    {
+        return Topic::whereIn('id', explode(',', $this->topic_ids))->pluck('name', 'id');
+    }
+
+}

app/Models/PostComment.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/6
+ * Time: 11:21
+ */
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\Model;
+
+class PostComment extends Model
+{
+//
+    protected $table = 'post_comment';
+    protected $guarded = [];
+}

app/Models/PostData.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/6
+ * Time: 11:21
+ */
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\Model;
+
+class PostData extends Model
+{
+//
+    protected $table = 'post_data';
+    protected $guarded = [];
+}

app/Models/PostImgs.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/6
+ * Time: 11:21
+ */
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class PostImgs extends Model
+{
+//
+    use SoftDeletes;
+    protected $table = 'post_imgs';
+    protected $guarded = [];
+}

app/Models/Topic.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/6
+ * Time: 11:21
+ */
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\Model;
+
+class Topic extends Model
+{
+    //
+    protected $table = 'topic';
+    protected $guarded = [];
+
+}

app/Repositories/PostRepositories.php

@@ -10,6 +10,7 @@ namespace App\Repositories;
 
 
 use App\Models\Behavior;
+use App\Models\Post;
 use App\Models\PostCollect;
 use App\Models\PostData;
 use App\Models\PostLike;
@@ -18,8 +19,75 @@ use Illuminate\Support\Facades\Redis;
 
 class PostRepositories
 {
-    public function __construct()
+    public function __construct(Post $post)
     {
+        $this->post = $post;
+    }
+
+    /**
+     * 推荐内容列表
+     */
+    public function suggestPost($request)
+    {
+        $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
+        $where = [];
+        if(isset($request['content'])){
+            $where[] = ['content', 'like', "%{$request['content']}%"];
+        }
+        if(isset($request['is_suggest'])){
+            $where[] = ['is_suggest', $request['is_suggest']];
+        }
+        if(isset($request['type'])){
+            $where[] = ['type', $request['type']];
+        }
+
+        if(isset($request['uid'])){
+            $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.*')
+            ->where($where)
+            ->where(function($query) use ($request){
+                if(isset($request['keyword'])){
+                    $query->where('uid', '=', $request['keyword'])
+                        ->orWhere('username', 'like', "%{$request['keyword']}%")
+                        ->orWhere('mobile', 'like', "%{$request['keyword']}%");
+                }
+            })
+            ->where(function($query) use ($request){
+                if(isset($request['created_at'])){
+                    $time = explode('_', $request['created_at']);
+                    $query->whereBetween('post.created_at', $time);
+                }
+            })
+            ->where(function ($query) use ($request){
+                if(isset($request['category_ids']) || isset($request['topic_ids'])){
+                    $ids = [];
+                    if (isset($request['category_ids'])) {
+                        $categoryIds = explode('_', $request['category_ids']);
+                        $ids = $this->categoryTopic->whereIn('category_id', $categoryIds)->pluck('topic_id')->toArray();
+                    }
+                    if (isset($request['topic_ids'])) {
+                        $ids = array_merge($ids, explode('_', $request['topic_ids']));
+                    }
+                    foreach ($ids as $key=>$id) {
+                        if ($key==0) {
+                            $query = $query->whereRaw('FIND_IN_SET('.$id.',topic_ids)');
+                        } else {
+                            $query = $query->orWhereRaw('FIND_IN_SET('.$id.',topic_ids)');
+                        }
+                    }
+                }
+            })
+            ->orderBy($sort,'desc')
+            ->paginate($perPage);
     }
 
     /**

app/Transformers/Post/SuggestTransformer.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/15
+ * Time: 11:07
+ */
+namespace  App\Transformers\Post;
+
+use App\Models\Post;
+use Carbon\Carbon;
+use League\Fractal\TransformerAbstract;
+
+class SuggestTransformer extends TransformerAbstract
+{
+    public function transform(Post $post)
+    {
+        return [
+            'id' => $post['id'],
+        ];
+    }
+}

routes/api.php

@@ -18,8 +18,10 @@ $api->version('v1', [
 ], function ($api) {
 
     //登录+验签
-    $api->group(['middleware' => ['chxq_jwt_auth','chxq_sign']], function ($api) {
-
+//    $api->group(['middleware' => ['chxq_jwt_auth','chxq_sign']], function ($api) {
+    $api->group(['middleware' => ['chxq_jwt_auth']], function ($api) {
+        $api->get('test', 'TestController@index');
+        $api->get('post/suggest', 'PostController@suggestPost');
     });
 
 });