新需求-后台优化

This commit is contained in:
2025-10-20 15:12:17 +08:00
parent c46038cf5b
commit 287523fc88

View File

@@ -379,8 +379,8 @@ class Guild extends adminApi
$page = input('page', 1); $page = input('page', 1);
$page_limit = input('page_limit', 30); $page_limit = input('page_limit', 30);
$guild_id = input('guild_id', 0); $guild_id = input('guild_id', 0);
$search_stime = input('search_stime',''); $search_stime_str = input('search_stime','');
$search_etime = input('search_etime',''); $search_etime_str = input('search_etime','');
$room_id = input('room_id', 0); $room_id = input('room_id', 0);
$where=['a.status'=>1]; $where=['a.status'=>1];
$where=['a.room_id'=>['>',0]]; $where=['a.room_id'=>['>',0]];
@@ -399,23 +399,37 @@ class Guild extends adminApi
->where(['a.guild_id'=>$guild_id])->where($where)->count(); ->where(['a.guild_id'=>$guild_id])->where($where)->count();
$list = db::name($this->table_guild_user)->alias('a') $list = db::name($this->table_guild_user)->alias('a')
->join('vs_room b', 'a.room_id = b.id', 'left') ->join('vs_room b', 'a.room_id = b.id', 'left')
->where(['a.guild_id'=>$guild_id])->where($where)->page($page, $page_limit)->select(); ->where(['a.guild_id'=>$guild_id])->where($where)
// ->page($page, $page_limit)
->select();
if(!$list){ if(!$list){
return V(0,"暂无数据"); return V(0,"暂无数据");
} }
$rum_lists = []; $rum_lists = [];
foreach ($list as $k=>$v){ foreach ($list as $k=>$v){
if($search_stime!="" && $v['createtime'] < strtotime($search_stime)){ $search_stime = $search_stime_str;
$search_stime = $search_stime; $search_etime = $search_etime_str;
}else{ if($search_stime!=""){
$search_stime = date('Y-m-d H:i:s',$v['createtime']) ; if($search_stime!="" && $v['createtime'] < strtotime($search_stime)){
} $search_stime = $search_stime;
if($v['quit_time']){
if($search_etime!="" && $v['quit_time'] > strtotime($search_etime)){
$search_etime = $search_etime;
}else{ }else{
$search_etime = date('Y-m-d H:i:s',$v['quit_time']); $search_stime = date('Y-m-d H:i:s',$v['createtime']) ;
} }
}else{
$search_stime = $search_stime;
}
if($search_etime!=""){
if($v['quit_time']){
if($search_etime!="" && $v['quit_time'] > strtotime($search_etime)){
$search_etime = $search_etime;
}else{
$search_etime = date('Y-m-d H:i:s',$v['quit_time']);
}
}else{
$search_etime = $search_etime;
}
}else{
$search_etime = $search_etime;
} }
$room_info = db::name('vs_room')->where(['id'=>$v['room_id']])->find(); $room_info = db::name('vs_room')->where(['id'=>$v['room_id']])->find();
@@ -428,6 +442,11 @@ class Guild extends adminApi
$rum_lists[$k]['consumption']= model('Room')->getRoomFlow($v['room_id'],$search_stime,$search_etime); $rum_lists[$k]['consumption']= model('Room')->getRoomFlow($v['room_id'],$search_stime,$search_etime);
$rum_lists[$k]['add_time'] = date('Y-m-d H:i:s',$v['createtime']); $rum_lists[$k]['add_time'] = date('Y-m-d H:i:s',$v['createtime']);
} }
usort($rum_lists, function($a, $b) {
return $b['consumption'] - $a['consumption'];
});
//分页
$rum_lists = array_slice($rum_lists, ($page-1)*$page_limit, $page_limit);
$return_data = [ $return_data = [
'page' =>$page, 'page' =>$page,
'page_limit' => $page_limit, 'page_limit' => $page_limit,
@@ -661,7 +680,7 @@ class Guild extends adminApi
$lists_data = db::name($this->table_guild_subsidy)->alias('a') $lists_data = db::name($this->table_guild_subsidy)->alias('a')
->join('vs_guild b','a.guild_id = b.id') ->join('vs_guild b','a.guild_id = b.id')
->where($where) ->where($where)
->order('a.id desc') ->order('a.total_transaction desc')
->field('a.*,b.guild_name,b.user_id,b.guild_special_id') ->field('a.*,b.guild_name,b.user_id,b.guild_special_id')
->page($page,$page_limit) ->page($page,$page_limit)
->select(); ->select();