Merge remote-tracking branch 'origin/develop' into develop

application/api/model/Room.php

@@ -72,7 +72,7 @@ class Room extends Model
             $data['type_id'] = 6;//cp电影房
             $room_intro = $room_intro.'('.$type.')';
             $data['apply_status'] = 2;
-            $data['label_id'] = 8;
+            $data['label_id'] = 11;
         }
         else{//cp电影房
             $data['room_number'] = $this->get_user_code();

application/api/model/SendGift.php

@@ -74,7 +74,7 @@ class SendGift extends Model
         //送礼 开启事务
         Db::startTrans();
 
-        if($room_label == 8){//酒吧房下的小黑屋  房间流水和送礼记录、收益 都记录在酒吧房
+        if($room_label == 11){//酒吧房下的小黑屋  房间流水和送礼记录、收益 都记录在酒吧房
             $p_room_id = db::name('vs_room_bar_movie')->where('room_id',$room_id)->value('p_room_id');
             //金币购买送礼  1金币购买 2送背包礼物
             if($type == 1){

application/common/library/GiftQueue.php

@@ -25,7 +25,7 @@ class GiftQueue
     {
         try {
             // 验证必要字段
-            if (empty($giftData['user_id']) || empty($giftData['gift_user']) || empty($giftData['from_id'])) {
+            if (empty($giftData['user_id']) || empty($giftData['gift_user'])) {
                 Log::error('送礼队列数据不完整: ' . json_encode($giftData));
                 return false;
             }