From 156b5ed952b5008738f9057d86c4b8a0691566e3 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 2 Feb 2024 16:10:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index 95fe147..c42e63f 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -1753,8 +1753,12 @@ class CallBackController extends AbstractController
                 return $this->TrtcErrorReturn("缺少房间id");
             }
 
+            if ($request_params['EventInfo']['EventMsTs']){
+                return $this->TrtcErrorReturn("缺少时间戳");
+            }
+
             // 排除数据
-            if ($request_params['EventGroupId'] != 1){
+            if ($request_params['EventGroupId'] != 1 || $request_params['EventGroupId'] != 2){
                 return $this->TrtcErrorReturn("回调地址推送错误");
             }
 
@@ -1841,7 +1845,7 @@ class CallBackController extends AbstractController
                     }
 
                     if ($user['user_type'] != 1){
-                        return $this->TrtcErrorReturn("非患者");
+                        return $this->TrtcSuccessReturn();
                     }
 
                     // 检测视频状态
@@ -1867,10 +1871,6 @@ class CallBackController extends AbstractController
                         return $this->TrtcErrorReturn("已结束通话，此解散房间动作不做处理");
                     }
 
-                    if ($request_params['EventInfo']['EventMsTs']){
-                        return $this->TrtcErrorReturn("缺少时间戳");
-                    }
-
                     // 修改视频状态
                     $params = array();
                     $params['records_id'] = $video_record['records_id'];
@@ -1894,10 +1894,6 @@ class CallBackController extends AbstractController
                         return $this->TrtcErrorReturn("已开始通话，此视频推流动作不做处理");
                     }
 
-                    if ($request_params['EventInfo']['EventMsTs']){
-                        return $this->TrtcErrorReturn("缺少时间戳");
-                    }
-
                     // 修改视频状态
                     $params = array();
                     $params['records_id'] = $video_record['records_id'];
@@ -1921,10 +1917,6 @@ class CallBackController extends AbstractController
                         return $this->TrtcErrorReturn("已开始通话，此音频推流动作不做处理");
                     }
 
-                    if ($request_params['EventInfo']['EventMsTs']){
-                        return $this->TrtcErrorReturn("缺少时间戳");
-                    }
-
                     // 修改视频状态
                     $params = array();
                     $params['records_id'] = $video_record['records_id'];