MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
赵钊
2025-10-13 18:07:16 +08:00
parent 4628896157 aadaee553a
commit e76e4a8e49
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
application/adminapi/controller/Room.php
View File

@@ -992,6 +992,10 @@ class Room extends adminApi
$search_room_number = input('search_room_number', '');
$search_onwer_number = input('search_onwer_number', '');
$room_status = input('room_status', '');
//开始 时间
$start_time = input('start_time', '');
//结束 时间
$end_time = input('end_time', '');
if($search_room_number!==''){
$where['room_number'] = $search_room_number;
@@ -1002,6 +1006,19 @@ class Room extends adminApi
if($room_status!==''){
$where['room_status'] = $room_status;
}
//检查 时间格式 转为时间戳
// 检查并转换时间格式为时间戳
if(!empty($start_time)){
$start_time = strtotime($start_time);
}else{
$start_time = 0;
}
if(!empty($end_time)){
$end_time = strtotime($end_time);
}else{
$end_time = time();
}
$where['type_id'] = 6;
$count = db::name('vs_room')->where($where)->count();
$lists = db::name('vs_room')->field('id,room_name,room_cover,room_number,user_id,room_status,createtime')
@@ -1018,6 +1035,20 @@ class Room extends adminApi
$value['room_code'] = model('api/Decorate')->user_decorate_detail($value['id'], 7);
//房间状态1正常2封禁3关闭
$value['room_status_str'] = $value['room_status'] ==1 ? "正常" : ($value['room_status'] ==2 ? "封禁" : "关闭");
$cpRoom = db::name('vs_room_cp_movie')->where('room_id',$value['id'])->find();
if($cpRoom){
if($cpRoom['user_id'] == $value['user_id']){
$value['cp_nickname'] = db::name('user')->where('id', $cpRoom['user_id1'])->value('nickname');
$value['cp_user_id'] = db::name('user')->where('id', $cpRoom['user_id1'])->value('user_code');
}
if($cpRoom['user_id1'] == $value['user_id']){
$value['cp_nickname'] = db::name('user')->where('id', $cpRoom['user_id'])->value('nickname');
$value['cp_user_id'] = db::name('user')->where('id', $cpRoom['user_id'])->value('user_code');
}
}
$value['liushui'] = db::name('vs_give_gift')->where(['from_id' => $value['id'],'createtime' => ['between',[$start_time,$end_time]]])->sum('total_price') * get_system_config_value('coin_charm_exp');
}
$return_data = [
'page' =>$page,