加幸运币统计字段
This commit is contained in:
@@ -86,10 +86,10 @@ class Room extends GuildAdmin
|
||||
$search_stime = $search_stime_str;
|
||||
$search_etime = $search_etime_str;
|
||||
if($search_stime!=""){
|
||||
if($search_stime!="" && $v['createtime'] < strtotime($search_stime)){
|
||||
if($search_stime!="" && $v['apply_time'] < strtotime($search_stime)){
|
||||
$search_stime = $search_stime;
|
||||
}else{
|
||||
$search_stime = date('Y-m-d H:i:s',$v['createtime']) ;
|
||||
$search_stime = date('Y-m-d H:i:s',$v['apply_time']) ;
|
||||
}
|
||||
}else{
|
||||
$search_stime = $search_stime;
|
||||
@@ -143,7 +143,17 @@ class Room extends GuildAdmin
|
||||
$rum_lists[$k]['add_time'] = date('Y-m-d H:i:s',$v['createtime']);
|
||||
$total_consumption += $rum_lists[$k]['consumption'];
|
||||
|
||||
|
||||
//幸运币统计
|
||||
if($search_stime !== ''){
|
||||
$where_lucky['createtime'] = ['>=', strtotime($search_stime)];
|
||||
}
|
||||
if($search_etime !== ''){
|
||||
$where_lucky['createtime'] = ['<=', strtotime($search_etime)];
|
||||
}
|
||||
if(!empty($search_stime) && !empty($search_stime)){
|
||||
$where_lucky['createtime'] = ['between',[strtotime($search_stime),strtotime($search_stime)]];
|
||||
}
|
||||
$rum_lists[$k]['lucky_coin'] = db::name('vs_room_luck_value')->where('room_id',$v['room_id'])->where($where_lucky)->sum('luck_value');
|
||||
}
|
||||
usort($rum_lists, function($a, $b) {
|
||||
return $b['consumption'] - $a['consumption'];
|
||||
@@ -156,10 +166,21 @@ class Room extends GuildAdmin
|
||||
}
|
||||
//分页
|
||||
$rum_lists = array_slice($rum_lists, ($page-1)*$page_limit, $page_limit);
|
||||
//幸运币统计
|
||||
if($search_stime !== ''){
|
||||
$where_lucky['createtime'] = ['>=', strtotime($search_stime)];
|
||||
}
|
||||
if($search_etime !== ''){
|
||||
$where_lucky['createtime'] = ['<=', strtotime($search_etime)];
|
||||
}
|
||||
if(!empty($search_stime) && !empty($search_stime)){
|
||||
$where_lucky['createtime'] = ['between',[strtotime($search_stime),strtotime($search_stime)]];
|
||||
}
|
||||
$return_data = [
|
||||
'page' =>$page,
|
||||
'page_limit' => $page_limit,
|
||||
'total_consumption' => $total_consumption,
|
||||
'total_lucky_coin' => db::name('vs_room_luck_value')->where($where_lucky)->sum('luck_value'),
|
||||
'count' => $count,
|
||||
'lists' => $rum_lists
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user