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

app/Repositories/Post/PostRepository.php

@@ -189,24 +189,28 @@ class PostRepository
                 'status_code'   => 500
             ]);
         }
-        $content = '';
+        $content = [
+            'add_pv' => 0,
+            'add_praise_count' => 0,
+            'add_collect_count' => 0,
+            'add_share_count' => 0,
+        ];
         if($request['add_pv']){
             $postData->pv += $request['add_pv'];
-            $content .= '浏览数增加'.$request['add_pv'].'、';
+            $content['add_pv'] = $request['add_pv'];
         }
         if($request['add_praise_count']){
             $postData->praise_count += $request['add_praise_count'];
-            $content .= '点赞数增加'.$request['add_praise_count'].'、';
+            $content['add_praise_count'] = $request['add_praise_count'];
         }
         if($request['add_collect_count']){
             $postData->collect_count += $request['add_collect_count'];
-            $content .= '收藏数增加'.$request['add_collect_count'].'、';
+            $content['add_collect_count'] = $request['add_collect_count'];
         }
         if($request['add_share_count']){
             $postData->share_count += $request['add_share_count'];
-            $content .= '分享数增加'.$request['add_share_count'];
+            $content['add_share_count'] = $request['add_share_count'];
         }
-        $content = rtrim($content, '、');
         DB::beginTransaction();
         try{
             $postData->save();
@@ -215,7 +219,7 @@ class PostRepository
                 'uid' => $uid,
                 'username' => $username,
                 'log_type' => 'add_data',
-                'content' => $content
+                'content' => json_encode($content)
             ]);
 
             DB::commit();

app/Transformers/Post/LogTransformer.php

@@ -15,12 +15,25 @@ class LogTransformer extends TransformerAbstract
 {
     public function transform(PostLog $postLog)
     {
+        $type = [
+            'add_pv' => '增加浏览量：',
+            'add_praise_count' => '增加点赞数：',
+            'add_collect_count' => '增加收藏数：',
+            'add_share_count' => '增加分享数：',
+        ];
+        $data = json_decode($postLog['content']);
+        $content = '';
+        foreach($data as $key => $val){
+            if(!$val) continue;
+            $content .= $type[$key] . $val .'、';
+        }
+        $content = rtrim($content, '、');
         return [
             'id' => $postLog['id'],
             'username' => $postLog['username'],
             'log_type' => $postLog['log_type'],
             'created_at' => Carbon::parse($postLog['created_at'])->toDateTimeString(),
-            'content' => $postLog['content'],
+            'content' => $content,
         ];
     }
 }