diff --git a/application/api/controller/BlindBoxTurntable.php b/application/api/controller/BlindBoxTurntable.php index b288bdb..a40a692 100644 --- a/application/api/controller/BlindBoxTurntable.php +++ b/application/api/controller/BlindBoxTurntable.php @@ -25,8 +25,7 @@ class BlindBoxTurntable extends BaseCom public function get_gift_list(){ $gift_bag_id = input('gift_bag_id',0); $room_id = input('room_id',0); - $user_id = $this->uid ?? 0; - $reslut = model('BlindBoxTurntableGift')->get_gift_list($gift_bag_id,$room_id,$user_id); + $reslut = model('BlindBoxTurntableGift')->get_gift_list($gift_bag_id,$room_id); return v($reslut['code'], $reslut['msg'], $reslut['data']); } /* diff --git a/application/api/controller/Gift.php b/application/api/controller/Gift.php index 7c3b000..5c84b4e 100644 --- a/application/api/controller/Gift.php +++ b/application/api/controller/Gift.php @@ -26,7 +26,8 @@ class Gift extends BaseCom { $label = input('label',0); $room_id = input('room_id',0); - $reslut = model('Gift')->get_gift_list($label,$room_id); + $user_id = $this->uid ?? 0; + $reslut = model('Gift')->get_gift_list($label,$room_id,$user_id); return V($reslut['code'],$reslut['msg'], $reslut['data']); } //聊天送礼物 (音信) diff --git a/application/api/controller/RoomEmoji.php b/application/api/controller/RoomEmoji.php index 058e5b4..5269308 100644 --- a/application/api/controller/RoomEmoji.php +++ b/application/api/controller/RoomEmoji.php @@ -16,6 +16,7 @@ class RoomEmoji extends BaseCom public function emoji_list(){ $type_id = input('type_id', ""); $pid = input('pid', ""); + $user_id = $this->uid ?? 0; $reslut = model('RoomEmoji')->getRoomEmoji($type_id,$pid,true); return V($reslut['code'], $reslut['msg'], $reslut['data']); } diff --git a/application/api/model/Gift.php b/application/api/model/Gift.php index d7c7944..af5f655 100644 --- a/application/api/model/Gift.php +++ b/application/api/model/Gift.php @@ -40,6 +40,7 @@ class Gift extends Model $where['gift_price'] = ['>',$gift_price]; $where['label'] = ['<>',2]; } + $is_lock = 0; $is_open_blind_box_turntable = 0; if($room_id){ $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable'); @@ -76,17 +77,16 @@ class Gift extends Model }); $list = $list_data; } - $is_exclusive_gifts = 0; if ($label == 11) { // 专属礼物 $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); $power_list_ids = array_column($Nobility['power_list'],'id'); - if(in_array(5,$power_list_ids)){ - $is_exclusive_gifts = 1; - } - foreach ($list as &$v) { - $v['is_exclusive_gifts'] = $is_exclusive_gifts; + if(!in_array(5,$power_list_ids)){ + $is_lock = 1; } } + foreach ($list as &$v) { + $v['is_lock'] = $is_lock; + } return ['code' => 1, 'msg' => '获取成功', 'data' => $list]; } } diff --git a/application/api/model/RoomEmoji.php b/application/api/model/RoomEmoji.php index b18577c..52d7b3d 100644 --- a/application/api/model/RoomEmoji.php +++ b/application/api/model/RoomEmoji.php @@ -24,7 +24,7 @@ class RoomEmoji extends Model } //获取房间表情包 - public function getRoomEmoji($type_id=0,$pid=0, $isTree = false){ + public function getRoomEmoji($type_id=0,$pid=0, $isTree = false, $user_id = 0){ $where = []; if($type_id){ $where['type_id'] = $type_id; @@ -38,6 +38,17 @@ class RoomEmoji extends Model ->where($where) ->order('sort desc,id desc') ->select(); + $is_lock = 0; + if ($type_id == 3) { // 专属礼物 + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $power_list_ids = array_column($Nobility['power_list'],'id'); + if(!in_array(5,$power_list_ids)){ + $is_lock = 1; + } + } + foreach ($list as &$v) { + $v['is_lock'] = $is_lock; + } if ($isTree && !empty($list) && empty($pid)) { $list = $this->buildTree($list); }