diff --git a/app/chat/controller/MessageController.php b/app/chat/controller/MessageController.php index 59efd84..0ef4419 100644 --- a/app/chat/controller/MessageController.php +++ b/app/chat/controller/MessageController.php @@ -24,13 +24,18 @@ class MessageController extends ApiController $chatType = $request->post('chat_type'); // 1=单聊,2=群聊 $toId = $request->post('to_id'); // 单聊=对方ID,群聊=群ID $session_id = $request->post('session_id'); // 会话ID + $group_id = $request->post('group_id'); // 会话ID $page = $request->post('page', 1)?:1; $size = $request->post('size', 20)?:20; - if (!$toId || !$chatType || !$session_id) { + if (!$toId || !$chatType || !$session_id || !$group_id) { return $this->error('参数不完整'); } + $group = Db::name('chat_group')->where(['id' => $group_id])->find(); + if (!$group) { + return $this->error('群不存在'); + } // 构建查询条件 $query = Db::name('chat_message')->where(['session_id' => $session_id]); @@ -72,7 +77,11 @@ class MessageController extends ApiController foreach ($messages as $k => &$v) { $v['send_time'] = formatWeChatTime($v['send_time']); } + + $mute = Db::name('chat_group_mute')->where(['group_id' => $group_id, 'user_id' => 0])->find(); + $group['is_mute'] = $mute?1:0; return $this->success([ + 'group' => $group, 'list' => $messages, 'page' => $page, 'size' => $size,