Merge branch 'battle' into develop

app/Models/PostCommentLike.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 PostCommentLike extends Model
+{
+//
+    protected $table = 'post_comment_like';
+    protected $guarded = [];
+
+}

app/Repositories/BehaviorRecordRepositories.php

@@ -48,7 +48,8 @@ class BehaviorRecordRepositories
             'unlike' => 'general_ledger_record',
             'forward' => 'general_ledger_record',
             'collect' => 'general_ledger_record',
-            'comment' => 'comment_account_record'
+            'comment' => 'comment_account_record',
+            'comment_like' => 'general_ledger_record'
         ];
         return isset($tables[$behavior]) ? $tables[$behavior] : false;
     }
@@ -183,6 +184,11 @@ class BehaviorRecordRepositories
             if ($general['trigger_type']) {
                 $behavior->effective_trigger += 1;
             }
+            //评论点赞  存储当前评论的ID以及评论发布人ID
+            if ('comment_like' == $general['behavior_flag']) {
+                $data['related_content_id'] = $general['cl_comment_id'];
+                $data['content_author_id'] = $general['cl_comment_uid'];
+            }
             $behavior->save();
             DB::commit();
             //统计用户所有动态当天被阅读数

app/Repositories/PostRepositories.php

@@ -15,6 +15,7 @@ use App\Models\MemberFollowTopic;
 use App\Models\Post;
 use App\Models\PostCollect;
 use App\Models\PostComment;
+use App\Models\PostCommentLike;
 use App\Models\PostData;
 use App\Models\PostDislike;
 use App\Models\PostImgs;
@@ -511,7 +512,7 @@ class PostRepositories
         }
 
         $topicIds = [];
-        if(isset($request['category_id']) && $request['category_id']){
+        if (isset($request['category_id']) && $request['category_id']) {
             $topicIds = $this->categoryTopic->where('category_id', $request['category_id'])->pluck('topic_id')->toArray();
         }
 
@@ -686,6 +687,21 @@ class PostRepositories
                 Redis::HINCRBY($postInfoKey, 'praise_count', -1);
                 Log::debug("帖子：" . $postId . "被取消点赞，praise_count -1");
             }
+        } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'comment_like') {
+            //用户点赞评论
+            $comment = PostComment::where('id', $request['cl_comment_id'])->first();
+            $postLikeKey = "comment_like_" . $postId;
+            if ($request['behavior_value']) {
+                $comment->like_count += 1;
+                PostCommentLike::create(['uid' => $request['target_id'], 'comment_id' => $request['cl_comment_id']]);
+                Redis::sadd($postLikeKey, $request['target_id'] . '_' . $request['cl_comment_id']);
+                Log::debug("评论：" . $request['cl_comment_id'] . "被点赞，like_count +1");
+            } else {
+                $comment->like_count -= 1;
+                PostCommentLike::where(['uid' => $request['target_id'], 'comment_id' => $request['cl_comment_id']])->delete();
+                Redis::srem($postLikeKey, $request['target_id'] . '_' . $request['cl_comment_id']);
+                Log::debug("评论：" . $request['cl_comment_id'] . "被取消点赞，like_count -1");
+            }
         } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'forward') {
             $post->share_count += 1;
             $post->share_real_count += 1;