From d96931c7e5c4945934effb2e8a37432914934cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Tue, 6 Jan 2026 18:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=EF=BC=9A->=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4-=E6=92=A9TA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/BarRoom.php |  7 -----
 application/api/model/BarRoom.php      | 41 +-------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/application/api/controller/BarRoom.php b/application/api/controller/BarRoom.php
index b7cc3f9c..e78808a0 100644
--- a/application/api/controller/BarRoom.php
+++ b/application/api/controller/BarRoom.php
@@ -42,14 +42,7 @@ class BarRoom extends BaseCom
         $reslut = model('BarRoom')->get_gift_info_ta($room_id, $to_user_id);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
-    //撩TA所需金币查询
-    public function get_liao_ta_coin(){
-        $type = input('type', 0);
-        $room_id = input('room_id', 0);
-        $reslut = model('BarRoom')->get_liao_ta_coin($type,$room_id);
-        return V($reslut['code'], $reslut['msg'], $reslut['data']);
 
-    }
     //撩TA
     public function liao_ta(){
         $room_id = input('room_id', 0);
diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php
index d0802b85..6285589f 100644
--- a/application/api/model/BarRoom.php
+++ b/application/api/model/BarRoom.php
@@ -114,16 +114,7 @@ class BarRoom extends Model
         if($re['code'] != 1){
             return ['code' => 0, 'msg' => $re['msg'], 'data' => null];
         }
-        //推送撩TA消息
-        $FromUserInfo = db::name('vs_user')->where(['id' => $user_id])->find();
-        $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);
+        return ['code' => 1, 'msg' => '成功', 'data' => null];
     }
     //一键全撩
     public function one_key_liao_ta($room_id,$user_id){
@@ -141,7 +132,6 @@ class BarRoom extends Model
             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);
@@ -149,38 +139,9 @@ class BarRoom extends Model
         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];
     }
 
-    //撩TA所需金币查询
-    public function get_liao_ta_coin($type,$room_id){
-        $liao_ta_gif = $this->get_liao_ta_gift();
-        $liao_ta_coin = $liao_ta_gif['gift_price']??0;
-        $user_num = 1;
-        if($type != 1){
-            //查询麦上用户
-            $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];
-            }
-            $user_num = count($room_pit_Users);
-        }
-        $liao_ta_coin = $liao_ta_coin * $user_num;
-        $return_data = [
-            'coin' => $liao_ta_coin,
-        ];
-        return ['code' => 1, 'msg' => '获取成功', 'data' => $return_data];
-    }
-
     //获取撩TA礼物
     public function get_liao_ta_gift(){
         $cache_key = 'gift_list_17';