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

bug修改

Browse Source
This commit is contained in:
赵钊
2026-01-19 10:04:09 +08:00
parent 540dff822d
commit b2d1106e0b
3 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,19 +676,43 @@ class Room extends adminApi
if($type == 2){
$start_time = strtotime(date('Y-m-d'));
$end_time = $start_time + 86400;
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}elseif ($type == 3){
$start_time = strtotime(date('Y-m-d',strtotime('-1 day')));
$end_time = $start_time + 86400;
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}elseif ($type == 4){
$start_time = strtotime(date('Y-m-d',strtotime('-2 day')));
$end_time = $start_time + 86400;
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}elseif ($type == 1){
$start_time = 1748676768;//2025-06-00 15:32:48
$end_time = time();
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}
$profit = db::name('vs_give_gift')->where('from_id', $room_id)->where('from',2)->where('createtime', 'between', [$start_time, $end_time])->sum('total_price');
return $profit;
$all_total_price =0;
if($tables){
foreach ($tables as $table_name){
//表前缀
$table_prefix = config('database.prefix');
$table_name = str_replace($table_prefix, '', $table_name);
$total_price = db::name($table_name)->where('from_id', $room_id)->where('from',2)->where('createtime', 'between', [$start_time, $end_time])->sum('total_price');
$all_total_price += $total_price;
}
}
return $all_total_price;
}

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

@@ -3,6 +3,7 @@
namespace app\api\model;
use app\common\controller\Push;
use app\common\library\GiftTableManager;
use think\Cache;
use think\Db;
use think\Log;
@@ -432,13 +433,37 @@ class Room extends Model
$week = strtotime(date('Y-m-d', strtotime('this week Monday')));
//本周的房间流水
if($room_type == 6){
$total_transaction = db::name('vs_give_gift')
->where(['from_id' => $room_id, 'from' =>6, 'createtime' => ['between', [$week, time()]]])
->sum('total_price');
$tables = GiftTableManager::getTablesByTimeRange(
$week,
time()
);
$all_total_price =0;
if($tables){
foreach ($tables as $table_name){
//表前缀
$table_prefix = config('database.prefix');
$table_name = str_replace($table_prefix, '', $table_name);
$total_price = db::name($table_name)->where(['from_id' => $room_id, 'from' =>6, 'createtime' => ['between', [$week, time()]]])->sum('total_price');
$all_total_price += $total_price;
}
}
$total_transaction = $all_total_price;
}else{
$total_transaction = db::name('vs_give_gift')
->where(['from_id' => $room_id, 'from' =>2, 'createtime' => ['between', [$week, time()]]])
->sum('total_price');
$tables = GiftTableManager::getTablesByTimeRange(
$week,
time()
);
$all_total_price =0;
if($tables){
foreach ($tables as $table_name){
//表前缀
$table_prefix = config('database.prefix');
$table_name = str_replace($table_prefix, '', $table_name);
$total_price = db::name($table_name)->where(['from_id' => $room_id, 'from' =>2, 'createtime' => ['between', [$week, time()]]])->sum('total_price');
$all_total_price += $total_price;
}
}
$total_transaction = $all_total_price;
}
$ss = 0;

30
application/guildadmin/controller/Room.php
View File

@@ -289,19 +289,43 @@ class Room extends GuildAdmin
if($type == 2){
$start_time = strtotime(date('Y-m-d'));
$end_time = $start_time + 86400;
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}elseif ($type == 3){
$start_time = strtotime(date('Y-m-d',strtotime('-1 day')));
$end_time = $start_time + 86400;
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}elseif ($type == 4){
$start_time = strtotime(date('Y-m-d',strtotime('-2 day')));
$end_time = $start_time + 86400;
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}elseif ($type == 1){
$start_time = 1748676768;//2025-06-00 15:32:48
$end_time = time();
$tables = GiftTableManager::getTablesByTimeRange(
$start_time,
$end_time
);
}
$profit = db::name('vs_give_gift')->where('from_id', $room_id)->where('from',2)->where('createtime', 'between', [$start_time, $end_time])->sum('total_price');
return $profit;
$all_total_price =0;
if($tables){
foreach ($tables as $table_name){
//表前缀
$table_prefix = config('database.prefix');
$table_name = str_replace($table_prefix, '', $table_name);
$total_price = db::name($table_name)->where('from_id', $room_id)->where('from',2)->where('createtime', 'between', [$start_time, $end_time])->sum('total_price');
$all_total_price += $total_price;
}
}
return $all_total_price;
}
//房间访客
//type 1:今日 2:昨日 3：所有