公会成员详情

application/api/controller/Guild.php

@@ -545,38 +545,35 @@ class Guild extends Api
         $userService->updateGuildMember(['user_id'=>$memberData['user_id']]);
 
         //从user表拿一些用户信息
-        $memberInfo = model('GuildMember')
-            ->field('id,user_id,wealth,charm,gift_num,role,guild_id,createtime')
-            ->with(['user'=>function($uQuery){
-                $uQuery->field('id,avatar,nickname,gender,age,logintime,age_id,constellation_id,province_id,city_id');
-            }])->find($member_id);
+        $memberInfo = model('GuildMember')->alias('m')
+            ->join('user','m.user_id = user.id','LEFT')
+            ->field('m.id,m.user_id,m.wealth,m.charm,m.gift_num,m.role,m.guild_id,m.createtime,
+            user.avatar,user.nickname,user.gender,user.logintime,user.is_online,user.onlinetime')
+            ->where('m.id',$member_id)
+            ->find();
         if(!$memberInfo) $this->error("用户信息获取失败！");
+        $memberInfo = info_domain_image($memberInfo,['avatar']);
 
-        $userData  = isset($memberInfo['user']) ? $memberInfo['user'] : [];
-        $gender    = isset($userData['gender']) ? $userData['gender'] : 1;
-        $logintime = isset($userData['logintime']) ? $userData['logintime'] : 0;
+        //角色
+        $role = [0=>'成员',1=>'副会长',2=>'公会长'];
+        $memberInfo["role_text"] = $role[$memberInfo["role"]];
 
-        $userFieldInt = ['age'];
-        $userFieldStr = ['avatar','nickname','age_text','constellation_text','province_text','city_text'];
-        foreach ($userFieldInt as $keyInt => $valInt) {
-            if (!isset($memberInfo[$valInt])) {
-                $memberInfo[$valInt] = isset($userData[$valInt]) ? $userData[$valInt] : 0;
-            }
-        }
-        foreach ($userFieldStr as $keyStr => $valStr) {
-            if (!isset($memberInfo[$valStr])) {
-                $memberInfo[$valStr] = isset($userData[$valStr]) ? $userData[$valStr] : '';
+        //在线
+        if ($memberInfo['is_online'] == 1) {
+            $onlineText = '在线';
+        } else {
+            $onlineTime = get_last_time($memberInfo['onlinetime']);
+            $onlineText = $onlineTime.'在线';
+            $limitTime = time() - (3600 * 6);
+            if ($memberInfo['onlinetime'] < $limitTime) {
+                $onlineText = '离线';
             }
         }
-
-        unset($memberInfo['user']);
-        $memberInfo['gender_text'] = $gender == 1 ? '男' : '女';
-        $memberInfo["createtime"] = !empty($memberInfo["createtime"]) ? date("Y-m-d", $memberInfo["createtime"]) : '';
-        $memberInfo["logintime"] = !empty($logintime) ? date("Y-m-d", $logintime) : '';
+        $memberInfo['online_text'] = $onlineText;
 
         //我在这个公会的角色
-        $myGuildMember = model('GuildMember')->field('role')->where(["user_id"=>$this->auth->id,"guild_id"=>$memberInfo->guild_id])->find();
-        $memberInfo["my_role"] = !empty($myGuildMember) ? $myGuildMember['role'] : -1;
+        /*$myGuildMember = model('GuildMember')->field('role')->where(["user_id"=>$this->auth->id,"guild_id"=>$memberInfo->guild_id])->find();
+        $memberInfo["my_role"] = !empty($myGuildMember) ? $myGuildMember['role'] : -1;*/
 
         //几个比较大的值，改w单位
         $fieldArr = ['wealth','charm','gift_num'];