Merge branch 'develop'

app/Http/Controllers/V1/PostController.php

@@ -252,7 +252,7 @@ class PostController extends Controller
         }
         $detail = $this->postRepositories->detail($request['id']);
         if (!$detail) {
-            return jsonError('获取内容信息失败');
+            return jsonError('内容飞走了');
         }
         $fractal = new Manager();
         $res = new Item($detail, new DetailTransformer($userInfo['uid'], $userInfo['invite_code']));

app/Repositories/FeedRepositories.php

@@ -90,6 +90,7 @@ class FeedRepositories
                 }elseif ($feedType==4){//评论
                     $data['relate_id'] = $request['post_id'];
                     $content['post_desc'] = $request['post_desc'];
+                    $content['comment_id'] = $request['comment_id'];
                     $content['comment_desc'] = $request['comment_content'];
                     $content['beans'] = isset($request['rewards']['bean'])?intval($request['rewards']['bean']):0;
                     $content['post_type'] = $request['post_type'];
@@ -205,7 +206,14 @@ class FeedRepositories
         ];
     }
     public function getPostComment($post_id){
-       return $this->postComment->where(['post_id'=>$post_id,'parent_id'=>0,'is_delete'=>0  ])->select('id','uid','username','content')->orderBy('id','desc')->take(2)->get();
+       $comments = $this->postComment->where(['post_id'=>$post_id,'parent_id'=>0])->select('id','uid','username','content','is_delete')->orderBy('is_delete', 'asc')->orderBy('id', 'desc')->take(2)->get();
+       foreach($comments as &$comment){
+           if($comment->is_delete){
+                $comment->content = '该评论已被删除';
+           }
+           unset($comment->is_delete);
+       }
+       return $comments;
     }
 
     /**

app/Repositories/PostRepositories.php

@@ -658,6 +658,7 @@ class PostRepositories
             $this->postLog->create($logData);
 
             DB::commit();
+            Redis::SADD('delete_post_ids', $request['id']);
             Log::debug('删除内容失败：'.$request['id']);
             return jsonSuccess('删除内容成功');
 

app/Transformers/FeedTransformer.php

@@ -13,6 +13,7 @@ use App\Models\Feed;
 use App\Repositories\PostRepositories;
 use App\Traits\PostTrait;
 use App\Traits\UserTrait;
+use Illuminate\Support\Facades\Redis;
 use League\Fractal\TransformerAbstract;
 use Carbon\Carbon;
 use App\Models\PostDislike;
@@ -23,6 +24,14 @@ class FeedTransformer extends TransformerAbstract {
     use PostTrait;
     public function transform(Feed $feed)
     {
+        $content = null;
+        if($feed['content']){
+            $content = json_decode($feed['content']);
+            if(isset($content->comment_id) && Redis::SISMEMBER('delete_post_comment_ids', $content->comment_id)){
+                $content->comment_desc = '该评论已被删除';
+                unset($content->comment_id);
+            }
+        }
         return [
             'id' => $feed['id'],
             'uid' => $feed['uid'],
@@ -33,7 +42,7 @@ class FeedTransformer extends TransformerAbstract {
             'type' => $feed['type'],
             'relate_id' => $feed['relate_id'],
             'relate_data' => !empty($feed['relate_data'])?$feed['relate_data']:null,
-            'content' => !empty($feed['content'])?json_decode($feed['content']):null,
+            'content' => $content,
             'created_at' => Carbon::parse($feed['created_at'])->diffForHumans(),
         ];
     }

app/Transformers/Post/CommentTransformer.php

@@ -24,7 +24,7 @@ class CommentTransformer extends TransformerAbstract
                 'username' => subtext($val->username, 10),
                 'avatar' => $val->avatar,
                 'reply_username' => subtext($val->reply_username, 10),
-                'content' => $val->content,
+                'content' => $val->is_delete?'该评论已被删除':$val->content,
                 'created_at' => Carbon::parse($val->created_at)->diffForHumans(),
             ];
         }

app/Transformers/Post/MyTransformer.php

@@ -16,7 +16,7 @@ class MyTransformer extends TransformerAbstract
     {
         return [
             'id' => $post['id'],
-            'img' => $post['img'],
+            'img' => $post['deleted_at']?config('customer.post_delete_image'):$post['img'],
             'type' => $post['type'],
             'collect_bean' => $post->data->collect_bean,
         ];

app/Transformers/Post/SuggestTransformer.php

@@ -32,7 +32,7 @@ class SuggestTransformer extends TransformerAbstract
             $imgs[] = $img['img'];
         }
         $comment = [];
-        $comments = PostComment::where('post_id', $post['id'])->where('parent_id', 0)->orderBy('id', 'desc')->limit(2)->get();
+        $comments = PostComment::where('post_id', $post['id'])->where('parent_id', 0)->orderBy('is_delete', 'asc')->orderBy('id', 'desc')->limit(2)->get();
         foreach($comments as $item){
             $comment[] = [
                 'id' => $item->id,

config/customer.tpl

@@ -6,4 +6,5 @@ return [
     'app_service_url' => '{app_service_url}',
     'share_post_h5url' => '{share_post_h5url}',
     'share_post_bean' => '{share_post_bean}',
+    'post_delete_image' => '{post_delete_image}',
 ];