Merge remote-tracking branch 'origin/20241106_lj_chat'

app/JsonRpc/ChatService.php

@@ -853,6 +853,7 @@ class ChatService implements ChatServiceInterface
             $result = ChatTopic::where(['id' => $data['id']])->update(['status' => $data['status']]);
             var_dump($result, 'tedst111111111111111');
             var_dump(date('Y-m-d H:i:s'), 'tedst111111111111111');
+            $creatter = $topdata['user_id'];
             if ($data['status'] == 2) {
                 //插入一条消息
                 $chatRecordsData = [
@@ -866,8 +867,10 @@ class ChatService implements ChatServiceInterface
                     'group_receiver_id' => $topdata['user_id'],
                 ];
                 ChatRecords::insert($chatRecordsData);
-            } else {
-                ChatRecords::where('user_id', $topdata['user_id'])->where('receiver_id', $topdata['group_id'])->delete();
+            } elseif ($data['status'] == 3) {
+                ChatRecords::where('receiver_id', $topdata['group_id'])->delete();
+                ChatGroupsMember::where('group_id', $topdata['group_id'])
+                    ->where([["user_id", '!=', $creatter]])->delete();
             }
             Db::commit();
             if ($result) {