diff --git a/app/chat/controller/MessageController.php b/app/chat/controller/MessageController.php
index 44da371..4d5864b 100644
--- a/app/chat/controller/MessageController.php
+++ b/app/chat/controller/MessageController.php
@@ -64,7 +64,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,coupon,coupon_claim,chat_coupon_id')
+            ->field('msg.id,from_id,to_id,type,chat_type,msg_type,content,image_url,order_id,is_read,send_time,session_id,nick_name,user_id,avatar,type,coupon,coupon_claim,chat_coupon_id')
             ->page($page, $size)
             ->select()->toArray();
 
@@ -85,13 +85,19 @@ class MessageController extends ApiController
         foreach ($messages as $k => &$v) {
             $v['send_time'] = formatWeChatTime($v['send_time']);
             $v['coupon'] = !empty($v['coupon'])?json_decode($v['coupon']):'';
+            $v['nick'] = $v['nick_name'];
             // 判断是谁发的
             if($v['from_id'] == $this->uid) {
                 $v['is_user_send'] = 1; // 自己发的
             }else {
                 $v['is_user_send'] = 2; // 别人发的
             }
-
+            // 判断是不是商家发的
+            if($v['type'] == 2) {
+                $v['is_shop'] = 1; // 商家
+            }else {
+                $v['is_shop'] = 2; // 不是商家
+            }
         }
 
         $mute = Db::name('chat_group_mute')->where(['group_id' => $group_id, 'user_id' => 0])->find();
diff --git a/extend/chat/model/Base.php b/extend/chat/model/Base.php
index f886335..01c3d83 100644
--- a/extend/chat/model/Base.php
+++ b/extend/chat/model/Base.php
@@ -232,7 +232,7 @@ namespace extend\chat\model;
              return;
          }
          // 判断是不是商家发的
-         if($is_member['role'] == 1) {
+         if($is_member['role'] == 2) {
              $notice_data['is_shop'] = 1; // 商家
          }else {
              $notice_data['is_shop'] = 2; // 不是商家