|
@@ -534,6 +534,10 @@ class Guild extends Api
|
|
} else {
|
|
} else {
|
|
$onlineTime = get_last_time($user['onlinetime']);
|
|
$onlineTime = get_last_time($user['onlinetime']);
|
|
$onlineText = $onlineTime.'在线';
|
|
$onlineText = $onlineTime.'在线';
|
|
|
|
+ $limitTime = time() - (3600 * 6);
|
|
|
|
+ if ($user['onlinetime'] < $limitTime) {
|
|
|
|
+ $onlineText = '离线';
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$v['online_text'] = $onlineText;
|
|
$v['online_text'] = $onlineText;
|
|
@@ -560,20 +564,33 @@ class Guild extends Api
|
|
$where = [];
|
|
$where = [];
|
|
$where["a.guild_id"] = $guild_id;
|
|
$where["a.guild_id"] = $guild_id;
|
|
$where["a.status"] = 1;
|
|
$where["a.status"] = 1;
|
|
- $where["a.sign_time"] = ["gt",time()];
|
|
|
|
|
|
+ //$where["a.sign_time"] = ["gt",time()];
|
|
// 获取公会成员总数
|
|
// 获取公会成员总数
|
|
$guildMemberCount = \app\common\model\GuildMember::alias("a")->where($where)->count("id");
|
|
$guildMemberCount = \app\common\model\GuildMember::alias("a")->where($where)->count("id");
|
|
// 获取公会成员列表
|
|
// 获取公会成员列表
|
|
$guildMemberList = \app\common\model\GuildMember::alias("a")
|
|
$guildMemberList = \app\common\model\GuildMember::alias("a")
|
|
- ->field("a.id,u.avatar,u.nickname,u.gender,u.age,a.role")
|
|
|
|
|
|
+ ->field("a.id,u.avatar,u.nickname,u.gender,u.age,a.role,u.is_online,u.onlinetime")
|
|
->join("hx_user u","a.user_id = u.id")
|
|
->join("hx_user u","a.user_id = u.id")
|
|
->where($where)
|
|
->where($where)
|
|
->limit($pageStart,$pageNum)
|
|
->limit($pageStart,$pageNum)
|
|
->order("a.role","desc")
|
|
->order("a.role","desc")
|
|
->select();
|
|
->select();
|
|
$role = ["","管理","会长"];
|
|
$role = ["","管理","会长"];
|
|
- if($guildMemberList) foreach($guildMemberList as $k => &$v) {
|
|
|
|
- $v["role"] = $role[$v["role"]];
|
|
|
|
|
|
+ if($guildMemberList) {
|
|
|
|
+ foreach($guildMemberList as $k => &$v) {
|
|
|
|
+ $v["role"] = $role[$v["role"]];
|
|
|
|
+ if ($v['is_online'] == 1) {
|
|
|
|
+ $onlineText = '在线';
|
|
|
|
+ } else {
|
|
|
|
+ $onlineTime = get_last_time($v['onlinetime']);
|
|
|
|
+ $onlineText = $onlineTime.'在线';
|
|
|
|
+ $limitTime = time() - (3600 * 6);
|
|
|
|
+ if ($v['onlinetime'] < $limitTime) {
|
|
|
|
+ $onlineText = '离线';
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ $v['online_text'] = $onlineText;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
$res = [];
|
|
$res = [];
|
|
$res["memberCount"] = $guildMemberCount;
|
|
$res["memberCount"] = $guildMemberCount;
|