diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 3d43b6b..65b1e20 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -707,6 +707,18 @@ class Room extends Model
             db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
         }
         db::name('user_data')->where('user_id', $user_id)->update(['room_id' => $room_id]);
+        //进入房间保持心跳
+        $is_xintiao = db::name('vs_room_heartbeat')->where(['user_id' => $user_id, 'room_id' => $room_id])->find();
+        if($is_xintiao){
+            db::name('vs_room_heartbeat')->where('id' , $is_xintiao['id'])->update(['updatetime' => time()]);
+        }else{
+            db::name('vs_room_heartbeat')->insert([
+                'user_id' => $user_id,
+                'room_id' => $room_id,
+                'createtime' => time(),
+                'updatetime' => time()
+            ]);
+        }
 
         $room['is_use_code'] = 0;
         $liang = model('api/Decorate')->user_decorate_detail($room['id'],7);
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index a344395..d36f1f6 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -1048,6 +1048,20 @@ class RoomPit extends Model
                 $text['pit_number'] = $pit_number;
                 //聊天室推送系统消息
                 model('Chat')->sendMsg(1003,$room_id,$text);
+
+                //查找当前用户是否有申请上麦 有就删掉
+                $is_apply_pit = db::name('vs_room_pit_apply')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->find();
+                if($is_apply_pit){
+                    db::name('vs_room_pit_apply')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->delete();
+                }
+
+                $count = db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count();
+                //申请上麦推送消息
+                $text = [
+                    'text' => '申请上麦',
+                    'count' => $count
+                ];
+                model('Chat')->sendMsg(1034,$room_id,$text);
                 return ['code' => 1, 'msg' => '操作成功', 'data' => null];
             }
             if($pit_number == 10){