diff --git a/application/api/controller/GiftNew.php b/application/api/controller/GiftNew.php
index 8a278d1c..cc78e5aa 100644
--- a/application/api/controller/GiftNew.php
+++ b/application/api/controller/GiftNew.php
@@ -32,8 +32,9 @@ class GiftNew extends BaseCom
      */
     public function set_custom_gift(){
         $gift_id = input('gift_id', 0);
+        $room_id = input('room_id', 0);
         $gift_remark_name = input('gift_remark_name', '');
-        $reslut = model('GiftNew')->set_custom_gift($this->uid, $gift_id, $gift_remark_name);
+        $reslut = model('GiftNew')->set_custom_gift($this->uid, $gift_id, $room_id, $gift_remark_name);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
     /*
diff --git a/application/api/model/GiftNew.php b/application/api/model/GiftNew.php
index 68572f27..ca125351 100644
--- a/application/api/model/GiftNew.php
+++ b/application/api/model/GiftNew.php
@@ -120,25 +120,48 @@ class GiftNew extends Model
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
 
+
     //自定义礼物设置
-    public function set_custom_gift($user_id, $gift_id, $gift_remark_name){
+    public function set_custom_gift($user_id, $gift_id, $room_id, $gift_remark_name){
         $gift_info = db::name('vs_gift')->where(['gid' => $gift_id, 'delete_time' => 0, 'is_show' => 1])->find();
         if(!$gift_info){
             return ['code' => 0, 'msg' => '礼物不存在','data' =>null];
         }
-        $user_custom_gift = db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_id'=>$gift_id])->find();
-        if($user_custom_gift){
-            db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_id'=>$gift_id])->update(['gift_remark_name'=>$gift_remark_name,'updatetime'=>time()]);
+        if(empty($gift_remark_name)){
+            $type = 0;//删除
         }else{
-            db::name('vs_user_custom_gift')->insert([
+            $type = 1;
+        }
+
+        $user_custom_gift = db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'room_id'=>$room_id,'gift_id'=>$gift_id])->find();
+        if($user_custom_gift){
+            db::name('vs_user_custom_gift')->where(['id' => $user_custom_gift['id']])->update(['gift_remark_name'=>$gift_remark_name,'updatetime'=>time()]);
+        }else{
+            $res = db::name('vs_user_custom_gift')->insert([
                 'user_id' => $user_id,
                 'gift_id'=>$gift_id,
+                'room_id'=>$room_id,
                 'gift_remark_name'=>$gift_remark_name,
                 'createtime'=>time()
             ]);
+            if(!$res){
+                return ['code' => 0, 'msg' => '设置失败','data' =>null];
+            }
+        }
+        $user_on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->value('pit_number');
+        if($user_on_pit){
+            $text['text'] = '设置自定义礼物';
+            $text['type'] = $type;
+            $text['user_id'] = $user_id;
+            $text['pit_number'] = $user_on_pit;
+            //聊天室推送系统消息
+            model('Chat')->sendMsg(1203,$room_id,$text);
         }
         return ['code' => 1, 'msg' => '设置成功','data' =>null];
     }
+
+
+
     //自定义礼物列表
     public function get_custom_gift_list($user_id){
         $list = db::name('vs_user_custom_gift')
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 862dda4c..3ca9b104 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -1009,6 +1009,14 @@ class RoomPit extends Model
                     return ['code' => 0, 'msg' => '此类型房间  不能上7、8号麦位', 'data' => null];
                 }
             }
+            if($room_type == 11){
+                $text['text'] = '邀请你上麦';
+                $text['user_id'] = $accept_user_id;
+                $text['pit_number'] = $pit_number;
+                //聊天室推送系统消息
+                model('Chat')->sendMsg(1202,$room_id,$text);
+                return ['code' => 1, 'msg' => '操作成功', 'data' => null];
+            }
             $room_label = db::name('vs_room')->where(['id' => $room_id])->value('label_id');
             if($room_type == 1 && $room_label == 2 && !$pit_number){
                 $res = model('RoomPit')->agree_pit($user_id, $room_id, $accept_user_id,1);