diff --git a/app/Amqp/Consumer/SendVideoNoticeDelayDirectConsumer.php b/app/Amqp/Consumer/SendVideoNoticeDelayDirectConsumer.php index 99a2bb0..f3d71c4 100644 --- a/app/Amqp/Consumer/SendVideoNoticeDelayDirectConsumer.php +++ b/app/Amqp/Consumer/SendVideoNoticeDelayDirectConsumer.php @@ -113,8 +113,8 @@ class SendVideoNoticeDelayDirectConsumer extends ConsumerMessage // 检测是否已开过视频 $params = array(); $params['order_inquiry_id'] = $order_inquiry_video_reservation['order_inquiry_id']; - $order_inquiry_video_records = OrderInquiryVideoRecord::getOne($params); - if (!empty($order_inquiry_video_records)) { + $order_inquiry_video_record = OrderInquiryVideoRecord::getOne($params); + if (!empty($order_inquiry_video_record)) { Log::getInstance("queue-SendVideoNotice")->info("已开过视频,无需发送" ); return Result::ACK; } diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index 82a58f0..7ea9d72 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -1784,8 +1784,8 @@ class CallBackController extends AbstractController $params = array(); $params['room_id'] = $request_params['EventInfo']['RoomId']; $params['order_inquiry_id'] = $order_inquiry_video_reservation['order_inquiry_id']; - $order_inquiry_video_records = OrderInquiryVideoRecord::getLastOne($params); - if (empty($order_inquiry_video_records)){ + $order_inquiry_video_record = OrderInquiryVideoRecord::getLastOne($params); + if (empty($order_inquiry_video_record)){ return $this->TrtcErrorReturn("缺少视频开启记录"); } @@ -1855,14 +1855,14 @@ class CallBackController extends AbstractController } // 检测视频状态 - if ($order_inquiry_video_records['video_status'] == 3 || $order_inquiry_video_records['video_status'] == 4){ + if ($order_inquiry_video_record['video_status'] == 3 || $order_inquiry_video_record['video_status'] == 4){ // 已开始/结束通话,进入房间动作不做处理 return $this->TrtcSuccessReturn(); } // 修改视频状态 $params = array(); - $params['records_id'] = $order_inquiry_video_records['records_id']; + $params['records_id'] = $order_inquiry_video_record['records_id']; $data = array(); $data['video_status'] = 2; @@ -1874,14 +1874,14 @@ class CallBackController extends AbstractController break; case '102': // 解散房间 // 检测视频状态 - if ($order_inquiry_video_records['video_status'] == 4){ + if ($order_inquiry_video_record['video_status'] == 4){ // 已结束通话,解散房间动作不做处理 return $this->TrtcSuccessReturn(); } // 修改视频状态 $params = array(); - $params['records_id'] = $order_inquiry_video_records['records_id']; + $params['records_id'] = $order_inquiry_video_record['records_id']; $data = array(); $data['video_status'] = 4; @@ -1894,19 +1894,19 @@ class CallBackController extends AbstractController break; case '201': // 视频推流 // 检测视频状态 - if ($order_inquiry_video_records['video_status'] == 4){ + if ($order_inquiry_video_record['video_status'] == 4){ // 已结束通话,视频推流动作不做处理 return $this->TrtcSuccessReturn(); } - if ($order_inquiry_video_records['video_status'] == 3){ + if ($order_inquiry_video_record['video_status'] == 3){ // 已开始通话,视频推流动作不做处理 return $this->TrtcSuccessReturn(); } // 修改视频状态 $params = array(); - $params['records_id'] = $order_inquiry_video_records['records_id']; + $params['records_id'] = $order_inquiry_video_record['records_id']; $data = array(); $data['video_status'] = 3; @@ -1919,7 +1919,7 @@ class CallBackController extends AbstractController break; case '203': // 音频推流 // 检测视频状态 - if ($order_inquiry_video_records['video_status'] == 4){ + if ($order_inquiry_video_record['video_status'] == 4){ // 已结束通话,音频推流动作不做处理 return $this->TrtcSuccessReturn(); } @@ -2029,7 +2029,7 @@ class CallBackController extends AbstractController } $request_params = json_decode($request_params,true); - return $this->recordingSuccessReturn(); + // 验证参数 if (empty($request_params['EventGroupId'])){ return $this->recordingErrorReturn("回调事件组为空"); @@ -2056,7 +2056,7 @@ class CallBackController extends AbstractController return $this->recordingErrorReturn("回调地址推送错误"); } - if (!in_array($request_params['EventType'],[102,103,201,203])){ + if (!in_array($request_params['EventType'],[301,312])){ return $this->recordingSuccessReturn(); } } catch (\Throwable $e) { diff --git a/app/Model/OrderInquiryVideoRecord.php b/app/Model/OrderInquiryVideoRecord.php index c257d3e..cd203b5 100644 --- a/app/Model/OrderInquiryVideoRecord.php +++ b/app/Model/OrderInquiryVideoRecord.php @@ -26,7 +26,7 @@ class OrderInquiryVideoRecord extends Model /** * The table associated with the model. */ - protected ?string $table = 'order_inquiry_video_records'; + protected ?string $table = 'order_inquiry_video_record'; /** * The attributes that are mass assignable. diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php index 967ec4b..d005220 100644 --- a/app/Services/InquiryService.php +++ b/app/Services/InquiryService.php @@ -1394,8 +1394,8 @@ class InquiryService extends BaseService // 检测是否已开过视频 $params = array(); $params['order_inquiry_id'] = $order_inquiry_id; - $order_inquiry_video_records = OrderInquiryVideoRecord::getOne($params); - if (!empty($order_inquiry_video_records)) { + $order_inquiry_video_record = OrderInquiryVideoRecord::getOne($params); + if (!empty($order_inquiry_video_record)) { $is_video = true; // 是否已开视频(0:否 1:是) } } diff --git a/app/Services/VideoService.php b/app/Services/VideoService.php index ac40b11..dda04d4 100644 --- a/app/Services/VideoService.php +++ b/app/Services/VideoService.php @@ -93,8 +93,8 @@ class VideoService extends BaseService // 检测是否已开过视频 $params = array(); $params['order_inquiry_id'] = $order_inquiry_id; - $order_inquiry_video_records = OrderInquiryVideoRecord::getOne($params); - if (!empty($order_inquiry_video_records)) { + $order_inquiry_video_record = OrderInquiryVideoRecord::getOne($params); + if (!empty($order_inquiry_video_record)) { return fail(HttpEnumCode::HTTP_ERROR, "已开过视频,无需再修改预约时间"); } @@ -280,8 +280,8 @@ class VideoService extends BaseService $data['room_id'] = $order_inquiry_video_reservation['room_id']; $data['video_status'] = 1; $data['start_video_time'] = date('Y-m-d H:i:s', time()); - $order_inquiry_video_records = OrderInquiryVideoRecord::addOrderInquiryVideoRecord($data); - if (empty($order_inquiry_video_records)) { + $order_inquiry_video_record = OrderInquiryVideoRecord::addOrderInquiryVideoRecord($data); + if (empty($order_inquiry_video_record)) { Db::rollBack(); return fail(HttpEnumCode::SERVER_ERROR, "发起视频失败"); }