房间热度卡开发-礼物列表调整

application/api/model/Gift.php

@@ -102,21 +102,18 @@ class Gift extends Model
 
         $map['delete_time'] = 0;
         $where['is_show'] = 1;
-        if ($label && $label != 99) {
-            $map['label'] = $label;
-        }
         if ($label == 99) { // 拍卖卡关系选择的礼物
             $gift_price = get_system_config_value('room_love_auction_cion');
             $where['gift_price'] = ['>',$gift_price];
             $where['label'] = ['in',[1,5]];
-        }
-        if ($label == 100) {// 哥单礼物
+        }elseif ($label == 100) {// 哥单礼物
             $gift_price = get_system_config_value('singer_lowest_cion');//歌单最低价格
             $where['gift_price'] = ['>',$gift_price];
             $where['label'] = ['in',[1,5]];
-        }
-        if($label == 0){// 其他普通礼物
+        }elseif($label == 0){// 其他普通礼物
             $where['label'] = ['in',[1,5]];
+        }else{
+            $map['label'] = $label;
         }
 
         $is_open_blind_box_turntable = 1;