diff --git a/app/chat/controller/MessageController.php b/app/chat/controller/MessageController.php index 0ef4419..398fe09 100644 --- a/app/chat/controller/MessageController.php +++ b/app/chat/controller/MessageController.php @@ -56,7 +56,7 @@ class MessageController extends ApiController $total = $query->count(); $messages = $query->alias('msg')->order('send_time', 'desc') ->leftJoin('chat_user user', 'msg.from_id = user.user_id') - ->field('msg.id,from_id,to_id,chat_type,msg_type,content,image_url,order_id,is_read,send_time,session_id,nick_name,user_id,avatar,type') + ->field('msg.id,from_id,to_id,chat_type,msg_type,content,image_url,order_id,is_read,send_time,session_id,nick_name,user_id,avatar,type,coupon') ->page($page, $size) ->select()->toArray(); @@ -76,6 +76,13 @@ class MessageController extends ApiController // } foreach ($messages as $k => &$v) { $v['send_time'] = formatWeChatTime($v['send_time']); + $v['coupon'] = json_decode($v['coupon']); + // 判断是谁发的 + if($v['from_id'] == $this->uid) { + $v['is_user_send'] = 1; // 自己发的 + }else { + $v['is_user_send'] = 2; // 别人发的 + } } $mute = Db::name('chat_group_mute')->where(['group_id' => $group_id, 'user_id' => 0])->find();