pk room_id 重置-回退-pk功能暂时关闭。

application/api/controller/RoomPk.php

@@ -9,6 +9,7 @@ class RoomPk extends BaseCom
     //发送PK邀请
     public function send_pk()
     {
+        return ['code' => 0, 'msg' => 'PK功能维护中，暂时无法发起 PK', 'data' => ''];
         $room_id_a = input('room_id_a', 0);//pk房间A_id
         $create_user_id  = input('create_user_id', 0);//发起人(谁发起，默认A组)
         $room_id_b = input('room_id_b', 0);//pk房间B_id （默认B组）

application/api/model/BlindBoxTurntableGift.php

@@ -79,10 +79,12 @@ class BlindBoxTurntableGift extends Model
             if(!$blind_box_turntable){
                 return ['code' => 1, 'msg' => '成功', 'data' => null];
             }
+            $room_id = $blind_box_turntable['room_id'];
             $blind_box_turntable_log = Db::name('vs_blind_box_turntable_results_log')->where(['tid'=>$send_id])->select();
             if(!$blind_box_turntable_log){
                 return ['code' => 0, 'msg' => '数据不存在','data' => null];
             }
+            $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name');
             $FromUserInfo = Db::name('user')->where(['id'=>$blind_box_turntable['user_id']])->find();
             $FromUserInfo['user_id'] = $FromUserInfo['id'];
             $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($blind_box_turntable['user_id']);//财富图标
@@ -92,8 +94,6 @@ class BlindBoxTurntableGift extends Model
             $userGiftMap = [];
             $ToUserInfo = [];
             foreach ($blind_box_turntable_log as $key => $value) {
-                $room_id = $value['gift_user_room_id'];
-                $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name');
                 $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
                 $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
                 $text_message = $user_nickname . '在' . $room_name . '房间送给了' . $ToUserInfo['nickname'] . $draw_gift['gift_name'] . 'X' . $value['count']."\n";
@@ -114,8 +114,7 @@ class BlindBoxTurntableGift extends Model
                 if (!isset($userGiftMap[$userId])) {
                     $userGiftMap[$userId] = [
                         'userInfo' => $ToUserInfo,
-                        'gifts' => [],
+                        'gifts' => []
-                        'room_id' => $room_id
                     ];
                 }
                 $userGiftMap[$userId]['gifts'][] = [
@@ -129,7 +128,6 @@ class BlindBoxTurntableGift extends Model
 
             // 为每个用户单独推送消息
             foreach($userGiftMap as $userId => $userData) {
-                $room_id = $userData['room_id'];
                 $userInfo = $userData['userInfo'];
                 $gifts = $userData['gifts'];
 

application/api/model/GiveGift.php

@@ -136,7 +136,6 @@ class GiveGift extends Model
         $give_gift = 0;
         $gift_user_data = [];
         foreach ($toarray as $k => $to_id){
-            $from_id = db::name('vs_room_visitor')->where(['user_id'=>$to_id])->order('id desc')->value('room_id');
             $gift_user_data[]['user_id'] = $to_id;
             $gift_box1 = [];
             $gift_box = [];
@@ -635,7 +634,6 @@ class GiveGift extends Model
         $give_gift = 0;
         $gift_user_data = [];
         foreach ($toarray as $k => $to_id){
-            $from_id = db::name('vs_room_visitor')->where(['user_id'=>$to_id])->order('id desc')->value('room_id');
             $gift_user_data[]['user_id'] = $to_id;
             $gift_box1 = [];
             $gift_box = [];

application/cron/controller/RoomPan.php

@@ -51,8 +51,6 @@ class RoomPan
             $user_nickname = $FromUserInfo['nickname'];
             $userGiftMap = [];
             foreach ($blind_box_turntable_results_log as $key => $value) {
-                $room_id = $value['gift_user_room_id'];
-                $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name');
                 $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
                 $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
                 $text_message = $user_nickname . '在' . $room_name . '房间送给了' . $ToUserInfo['nickname'] . $draw_gift['gift_name'] . 'X' . $value['count']."\n";
@@ -73,8 +71,7 @@ class RoomPan
                 if (!isset($userGiftMap[$userId])) {
                     $userGiftMap[$userId] = [
                         'userInfo' => $ToUserInfo,
-                        'gifts' => [],
+                        'gifts' => []
-                        'room_id' => $room_id
                     ];
                 }
                 $userGiftMap[$userId]['gifts'][] = [
@@ -88,7 +85,6 @@ class RoomPan
 
             // 为每个用户单独推送消息
             foreach($userGiftMap as $userId => $userData) {
-                $room_id = $userData['room_id'];
                 $userInfo = $userData['userInfo'];
                 $gifts = $userData['gifts'];