diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php
index bddec4c6..d0802b85 100644
--- a/application/api/model/BarRoom.php
+++ b/application/api/model/BarRoom.php
@@ -110,35 +110,54 @@ class BarRoom extends Model
         $liao_ta_gif = $this->get_liao_ta_gift();
         $liao_ta_gif_id = $liao_ta_gif['gid']??0;
         //调用送礼接口
-
+        $re = model("api/send_gift")->send_gift($user_id,$to_user_id,$liao_ta_gif_id,1,1,$room_id);
+        if($re['code'] != 1){
+            return ['code' => 0, 'msg' => $re['msg'], 'data' => null];
+        }
         //推送撩TA消息
         $FromUserInfo = db::name('vs_user')->where(['id' => $user_id])->find();
-
-//        $effectData = [
-//            'FromUserInfo' => $FromUserInfo,
-//            'ToUserInfo' => $userInfo,
-//            'GiftInfo' => $gift_inf,
-//            'gift_num' => $count,
-//            'text' => null
-//        ];
-//        // 聊天室推送礼物特效消息
-//        model('api/Chat')->sendMsg(1005,$room_id,$effectData);
+        $userInfo[0] = db::name('vs_user')->where(['id' => $to_user_id])->find();
+        $effectData[] = [
+            'FromUserInfo' => $FromUserInfo,
+            'ToUserInfo' => $userInfo,
+            'GiftInfo' => $liao_ta_gif,
+        ];
+        // 聊天室推送礼物特效消息
+        model('api/Chat')->sendMsg(1200,$room_id,$effectData);
     }
     //一键全撩
     public function one_key_liao_ta($room_id,$user_id){
         //查询撩TA礼物
         $liao_ta_gif = $this->get_liao_ta_gift();
         $liao_ta_gif_id = $liao_ta_gif['gid']??0;
-
         //查询麦上用户
         $room_pit_Users = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id'=>['>',0],'status' => 1])->value('user_id');
+        if(empty($room_pit_Users)){
+            return ['code' => 0, 'msg' => '没有麦上用户', 'data' => null];
+        }
+        $to_user_ids = [];
+        $userInfos = [];
         if($room_pit_Users){
             foreach ($room_pit_Users as $key => $value) {
                 //调用送礼接口
-
+                $to_user_ids[] = $value;
+                $userInfos[] = db::name('vs_user')->where(['id' => $value])->find();
             }
         }
+        $to_user_ids = implode(',',$to_user_ids);
+        $re = model("api/send_gift")->send_gift($user_id,$to_user_ids,$liao_ta_gif_id,1,1,$room_id);
+        if($re['code'] != 1){
+            return ['code' => 0, 'msg' => $re['msg'], 'data' => null];
+        }
         //推送一键全撩
+        $FromUserInfo = db::name('vs_user')->where(['id' => $user_id])->find();
+        $effectData[] = [
+            'FromUserInfo' => $FromUserInfo,
+            'ToUserInfo' => $userInfos,
+            'GiftInfo' => $liao_ta_gif,
+        ];
+        // 聊天室推送礼物特效消息
+        model('api/Chat')->sendMsg(1200,$room_id,$effectData);
         return ['code' => 1, 'msg' => '成功', 'data' => null];
     }
 
diff --git a/application/api/model/Chat.php b/application/api/model/Chat.php
index a702d87d..aa4de3ad 100644
--- a/application/api/model/Chat.php
+++ b/application/api/model/Chat.php
@@ -151,6 +151,9 @@ class Chat extends Model
         //爆币房推送信息
         // BlindCoinRoom = 1100,
 
+        //酒吧房撩TA推送
+        // BarRoomLiaoTa = 1200,
+