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

app/Http/Controllers/V1/CategoryController.php

@@ -24,7 +24,11 @@ class CategoryController extends Controller {
     //列表
     public function index(Request $request) {
         $categoryList = $this->categoryRepository->lists($request->all());
-        return $this->jsonSuccess($categoryList);
+        $fractal = new Manager();
+        $resource = new Collection($categoryList, new CategoryTransformer());
+        $resource->setPaginator(new IlluminatePaginatorAdapter($categoryList));
+        $data = $fractal->createData($resource)->toArray();
+        return jsonSuccess($data);
     }
     //获取多个话题
     public function getTopics(Request $request){
@@ -36,6 +40,6 @@ class CategoryController extends Controller {
             return jsonError($validator->errors()->first());
         }
         $categoryList = $this->categoryRepository->getTopics($data['ids']);
-        return $this->jsonSuccess($categoryList);
+        return jsonSuccess($categoryList);
     }
 }

app/Models/PostCollect.php

@@ -6,6 +6,7 @@
  * Time: 13:35
  */
 namespace App\Models;
+
 use Illuminate\Database\Eloquent\Model;
 
 class PostCollect extends Model

app/Models/PostShare.php

@@ -2,15 +2,17 @@
 /**
  * Created by PhpStorm.
  * User: Administrator
- * Date: 2019/6/15
- * Time: 13:35
+<<<<<<< HEAD
+ * Date: 2019-06-18
+ * Time: 17:14
  */
+
 namespace App\Models;
+
+
 use Illuminate\Database\Eloquent\Model;
 
-class PostShare extends Model
-{
-//
+class PostShare extends Model {
     protected $table = 'post_share';
     protected $guarded = [];
 }

app/Repositories/BehaviorRecordRepositories.php

@@ -100,10 +100,10 @@ class BehaviorRecordRepositories
             $this->registeredAccountsRecord->create($data);
             //修改行为统计数据
             $behavior = Behavior::where('virus_behavior_id',$register['virus_behavior_id'])->first();
-            $behavior->physical_strength += $register['physical_exertion'];
-            $behavior->grant_rainbow_beans += $register['quantity_issued'];
+            $behavior->physical_strength += intval($register['physical_exertion']);
+            $behavior->grant_rainbow_beans += intval($register['quantity_issued']);
             $behavior->trigger_times += 1;
-            $behavior->absolute_progression += $register['absolute_progression'];
+            $behavior->absolute_progression += intval($register['absolute_progression']);
             if($register['trigger_type']){
                 $behavior->effective_trigger += 1;
             }
@@ -139,8 +139,8 @@ class BehaviorRecordRepositories
             $data['quantity_issued'] = $release['quantity_issued'];
             $this->releaseRecord->create($data);
             $behavior = Behavior::where('virus_behavior_id',$release['virus_behavior_id'])->first();
-            $behavior->physical_strength += $release['physical_exertion'];
-            $behavior->grant_rainbow_beans += $release['quantity_issued'];
+            $behavior->physical_strength += intval($release['physical_exertion']);
+            $behavior->grant_rainbow_beans += intval($release['quantity_issued']);
             $behavior->trigger_times += 1;
             if($release['trigger_type']){
                 $behavior->effective_trigger += 1;
@@ -178,8 +178,8 @@ class BehaviorRecordRepositories
             $data['behavior_value'] = $general['behavior_value'];
             $this->generalLedgerRecord->create($data);
             $behavior = Behavior::where('virus_behavior_id',$general['virus_behavior_id'])->first();
-            $behavior->physical_strength += $general['physical_exertion'];
-            $behavior->grant_rainbow_beans += $general['quantity_issued'];
+            $behavior->physical_strength += intval($general['physical_exertion']);
+            $behavior->grant_rainbow_beans += intval($general['quantity_issued']);
             $behavior->trigger_times += 1;
             if($general['trigger_type']){
                 $behavior->effective_trigger += 1;
@@ -219,8 +219,8 @@ class BehaviorRecordRepositories
             $data['superior_comment_id'] = $comment['parent_comment_id'];
             $this->generalLedgerRecord->create($data);
             $behavior = Behavior::where('virus_behavior_id',$comment['virus_behavior_id'])->first();
-            $behavior->physical_strength += $comment['physical_exertion'];
-            $behavior->grant_rainbow_beans += $comment['quantity_issued'];
+            $behavior->physical_strength += intval($comment['physical_exertion']);
+            $behavior->grant_rainbow_beans += intval($comment['quantity_issued']);
             $behavior->trigger_times += 1;
             if($comment['trigger_type']){
                 $behavior->effective_trigger += 1;

app/Repositories/CategoryRepository.php

@@ -20,11 +20,12 @@ class CategoryRepository {
     //列表
     public function lists($request)
     {
+        $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
         $where = [];
         if(isset($request['is_suggest'])){
             $where[] = ['is_suggest', '=', $request['is_suggest']];
         }
-        return $this->category->where($where)->get();
+        return $this->category->where($where)->paginate($perPage);
     }
     //获取多个话题
     public function getTopics($ids){

routes/api.php

@@ -50,12 +50,14 @@ $api->version('v1', [
         $api->get('topic/detail', 'PostController@topicDetail');
         //关注推荐话题
         $api->post('memberFollowTopic', 'MemberFollowTopic@memberFollowTopic');
-        //关注话题
+        //关注单个话题
         $api->post('memberFollowTopic/follow', 'MemberFollowTopic@followTopic');
         //取消关注
         $api->delete('memberFollowTopic/cancel', 'MemberFollowTopic@cancelFollowTopic');
         //关注话题列表
         $api->get('memberFollowTopic', 'MemberFollowTopic@index');
+        //收藏列表
+        $api->get('postCollect', 'PostCollectController@index');
     });
 
 });