YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

上线代码修改

Browse Source
This commit is contained in:
赵钊
2025-10-25 17:24:22 +08:00
parent 88ff83ef21
commit acb010e295
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/adminapi/controller/BlindBox.php
View File

@@ -62,17 +62,14 @@ class BlindBox extends adminApi
$lists[$key]['gift_id'] = $value['foreign_id']; $lists[$key]['gift_id'] = $value['foreign_id'];
$lists[$key]['gift_name'] = $value['name']; $lists[$key]['gift_name'] = $value['name'];
$gift_data = db::name('vs_gift')->where(['gid'=>$value['foreign_id']])->find(); $gift_data = db::name('vs_gift')->where(['gid'=>$value['foreign_id']])->find();
if(empty($gift_data)){ $lists[$key]['base_image'] = $gift_data['base_image'] ?? "";
continue; $lists[$key]['gift_price'] = $gift_data['gift_price'] ?? 0;
} $lists[$key]['quantity'] = $value['quantity'] ?? 0;
$lists[$key]['base_image'] = $gift_data['base_image']; $lists[$key]['remaining_number'] = $value['remaining_number'] ?? 0;
$lists[$key]['gift_price'] = $gift_data['gift_price']; $lists[$key]['is_public_screen'] = $gift_data['is_public_screen'] ?? 0;
$lists[$key]['quantity'] = $value['quantity']; $lists[$key]['is_public_server'] = $gift_data['is_public_server'] ?? 0;
$lists[$key]['remaining_number'] = $value['remaining_number']; $lists[$key]['is_world_show'] = $value['is_world_show'] ?? 0;
$lists[$key]['is_public_screen'] = $gift_data['is_public_screen']; $lists[$key]['weight'] = $value['weight'] ?? 0;
$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]['createtime'] = date('Y-m-d H:i:s', $value['createtime']); $lists[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
} }

4
application/api/model/Room.php
View File

@@ -849,7 +849,7 @@ class Room extends Model
$friend = null; $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'); $open_time = db::name('vs_hour_ranking_config')->where('id', 1)->value('open_time');
if($open_time > 0){ if($open_time > 0){
if($open_time <= time()){ if($open_time <= time()){
@@ -2023,7 +2023,7 @@ class Room extends Model
$friend = null; $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'); $open_time = db::name('vs_hour_ranking_config')->order('id', 'desc')->value('open_time');
if($open_time > 0){ if($open_time > 0){
if($open_time <= time()){ if($open_time <= time()){