wesmiler 2 tahun lalu
induk
melakukan
c56c6c3db1
2 mengubah file dengan 8 tambahan dan 4 penghapusan
  1. 2 2
      app/Console/Commands/SocketServer.php
  2. 6 2
      app/Services/LiveService.php

+ 2 - 2
app/Console/Commands/SocketServer.php

@@ -294,10 +294,10 @@ class SocketServer extends Command
                     break;
                 case 'live_leave': // 进入直播间消息
                     RedisService::clear("caches:live:users_{$liveId}_{#$fromUid}");
-                    VideoCollectModel::where(['user_id'=> $fromUid,'type'=>1,'source_type'=>2,'collect_id'=>$liveId])->update(['is_online'=>2,'update_time'=>time()]);
+                    VideoCollectModel::where(['user_id'=> $fromUid,'type'=>1,'source_type'=>2,'collect_id'=>$liveId])->whereNotIn('collect_uid',[$fromUid])->update(['is_online'=>2,'update_time'=>time()]);
                 case 'live_entry': // 进入直播间消息
                     RedisService::clear("caches:live:users_{$liveId}_{#$fromUid}");
-                    VideoCollectModel::where(['user_id'=> $fromUid,'type'=>1,'source_type'=>2,'collect_id'=>$liveId])->update(['is_online'=>1,'update_time'=>time()]);
+                    VideoCollectModel::where(['user_id'=> $fromUid,'type'=>1,'source_type'=>2,'collect_id'=>$liveId])->whereNotIn('collect_uid',[$fromUid])->update(['is_online'=>1,'update_time'=>time()]);
                 case 'live_like': // 进入直播间消息
                 case 'follow': // 关注主播消息
                 case 'gift': // 打赏礼物消息

+ 6 - 2
app/Services/LiveService.php

@@ -619,8 +619,12 @@ class LiveService extends BaseService
             $this->error = 2981;
             return false;
         }
-        $updateData = ['is_online'=> 2, 'update_time'=> time()];
-        VideoCollectModel::where(['user_id'=>$userId,'type'=>1,'source_type'=>2,'collect_id'=> $id,'mark'=>1])->update($updateData);
+
+        if($info['usewr_id'] != $userId){
+            $updateData = ['is_online'=> 2, 'update_time'=> time()];
+            VideoCollectModel::where(['user_id'=>$userId,'type'=>1,'source_type'=>2,'collect_id'=> $id,'mark'=>1])->update($updateData);
+
+        }
 
         $this->error = 1003;
         return true;