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

app/Repositories/MemberFollowTopicRepository.php

@@ -9,7 +9,10 @@
 namespace App\Repositories;
 
 use App\Models\MemberFollowTopic;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
 use Tymon\JWTAuth\Facades\JWTAuth;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -27,10 +30,13 @@ class MemberFollowTopicRepository {
         $token =  JWTAuth::decode(JWTAuth::getToken());
         if($data){
             $category_topic_data = [];
+            $date = Carbon::now()->toDateTimeString();
             foreach($data as $value){
                 $category_topic_data[] = [
                     'uid' => $token['user']->uid,
                     'topic_id' => $value['id'],
+                    'created_at' => $date,
+                    'updated_at' => $date,
                 ];
             }
             DB::beginTransaction();
@@ -41,6 +47,13 @@ class MemberFollowTopicRepository {
                 if($res){
                     //更改关注状态
 
+                    //用户话题集合
+                    $key = 'topic.user_uid'.$token['user']->uid;
+                    foreach($data as $value){
+                        if(!Redis::zscore($key, $value['id'])){
+                            Redis::zincrby($key, 0, $value['id']);
+                        }
+                    }
                     return jsonSuccess();
                 }else{
                     return jsonError('关注失败');
@@ -77,6 +90,10 @@ class MemberFollowTopicRepository {
         $data = ['uid'=>$token['user']->uid,'topic_id'=>$topic_id];
         $res = $this->memberFollowTopic->create($data);
         if($res){
+            $key = 'topic.user_uid'.$token['user']->uid;
+            if(!Redis::zscore($key, $topic_id)){
+                Redis::zincrby($key, 0, $topic_id);
+            }
             return jsonSuccess();
         }else{
             return jsonError('关注失败');

app/Transformers/Post/SuggestTransformer.php

@@ -37,7 +37,7 @@ class SuggestTransformer extends TransformerAbstract
             $comment[] = [
                 'id' => $item->id,
                 'username' => subtext($item->username, 10),
-                'content' => $item->content,
+                'content' => $item->is_delete?'该评论已被删除':$item->content,
             ];
         }
         $topic = [];