diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php index 96a121c..e237bc3 100644 --- a/application/adminapi/controller/BlindBox.php +++ b/application/adminapi/controller/BlindBox.php @@ -62,17 +62,14 @@ class BlindBox extends adminApi $lists[$key]['gift_id'] = $value['foreign_id']; $lists[$key]['gift_name'] = $value['name']; $gift_data = db::name('vs_gift')->where(['gid'=>$value['foreign_id']])->find(); - if(empty($gift_data)){ - continue; - } - $lists[$key]['base_image'] = $gift_data['base_image']; - $lists[$key]['gift_price'] = $gift_data['gift_price']; - $lists[$key]['quantity'] = $value['quantity']; - $lists[$key]['remaining_number'] = $value['remaining_number']; - $lists[$key]['is_public_screen'] = $gift_data['is_public_screen']; - $lists[$key]['is_public_server'] = $gift_data['is_public_server']; - $lists[$key]['is_world_show'] = $value['is_world_show']; - $lists[$key]['weight'] = $value['weight']; + $lists[$key]['base_image'] = $gift_data['base_image'] ?? ""; + $lists[$key]['gift_price'] = $gift_data['gift_price'] ?? 0; + $lists[$key]['quantity'] = $value['quantity'] ?? 0; + $lists[$key]['remaining_number'] = $value['remaining_number'] ?? 0; + $lists[$key]['is_public_screen'] = $gift_data['is_public_screen'] ?? 0; + $lists[$key]['is_public_server'] = $gift_data['is_public_server'] ?? 0; + $lists[$key]['is_world_show'] = $value['is_world_show'] ?? 0; + $lists[$key]['weight'] = $value['weight'] ?? 0; $lists[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']); } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index a6ecceb..f19baf3 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -849,7 +849,7 @@ class Room extends Model $friend = null; } - $xlh_info['xlh_info'] = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id); + $xlh_info['xlh_info'] = model('api/BlindBoxTurntableGift')->get_user_xlh_info($room_id); $open_time = db::name('vs_hour_ranking_config')->where('id', 1)->value('open_time'); if($open_time > 0){ if($open_time <= time()){ @@ -2023,7 +2023,7 @@ class Room extends Model $friend = null; } - $xlh_info['xlh_info'] = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id); + $xlh_info['xlh_info'] = model('api/BlindBoxTurntableGift')->get_user_xlh_info($room_id); $open_time = db::name('vs_hour_ranking_config')->order('id', 'desc')->value('open_time'); if($open_time > 0){ if($open_time <= time()){