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

Revert "bug修改"

Browse Source 
This reverts commit 63b64dfb18.
This commit is contained in:
赵钊
2025-12-29 10:36:48 +08:00
parent 674e026c29
commit 32a8b351df
4 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,8 +323,6 @@ class Room extends GuildAdmin
$page = input('page', 1);
$page_limit = input('page_limit', 10);
$type = input('type', 1);//1:全部流水 2:日流水 3:周流水 4:月流水
$stime = input('stime', '');
$etime = input('etime', '');
if($room_id == ''){
return V(0,"参数错误");
}
@@ -350,18 +348,6 @@ class Room extends GuildAdmin
$end_time = time();
$where['a.createtime'] = ['between', [$begin_time, $end_time]];
}
if($stime != '' && $etime != ''){
$begin_time = strtotime($stime);
$end_time = strtotime($etime);
$where['a.createtime'] = ['between', [$begin_time, $end_time]];
}elseif($stime != '' && $etime == ''){
$begin_time = strtotime($stime);
$end_time = time();
$where['a.createtime'] = ['between', [$begin_time, $end_time]];
}elseif($etime != '' && $stime == ''){
$end_time = strtotime($etime);
$where['a.createtime'] = ['<=', $etime];
}
$count = db::name('vs_give_gift')->alias('a')
->field('a.id')
->join('user b', 'a.user_id = b.id', 'left')
@@ -391,8 +377,6 @@ class Room extends GuildAdmin
}
}
//幸运流水总计
$total_lucky_coin = db::name('vs_room_luck_value')->alias('a')->where('room_id',$room_id)->where($where)->sum('luck_value');
$return_data = [
'page' =>$page,
'page_limit' => $page_limit,
@@ -403,8 +387,7 @@ class Room extends GuildAdmin
->join('user b', 'a.user_id = b.id', 'left')
->where('a.from',2)
->where('a.from_id',$room_id)
->where($where)->sum('total_price'),
'total_lucky_coin' => $total_lucky_coin,
->where($where)->sum('total_price')
]
];
return V(1,"成功", $return_data);