家族成员修改

application/api/controller/Family.php

@@ -91,7 +91,7 @@ class Family extends Api
         // 获取公会成员信息
         /*$guildMemberInfo = \app\common\model\FamilyMember::alias("a")
             ->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
-            ->join("hx_user u","a.user_id = u.id")
+            ->join("user u","a.user_id = u.id")
             ->where(["a.guild_id"=>$guild_id])->where('a.status',1)->limit(10)->order("a.role","desc")->select();*/
 
         // 获取公会成员总数
@@ -272,7 +272,7 @@ class Family extends Api
                 Db::rollback();
                 $this->error('家族卡数量不足');
             }
-            $rs = Db::name('user_decorate_family')->where('id',$card['id'])->update(["is_using"=>0,'updatetime'=>time()]);
+            $rs = Db::name('user_decorate_family')->where('id',$card['id'])->update(["is_using"=>1,'updatetime'=>time()]);
             if(!$rs){
                 Db::rollback();
                 $this->error('使用家族卡失败');
@@ -429,7 +429,7 @@ class Family extends Api
         // 获取公会成员列表
         $guildMemberList = \app\common\model\FamilyMember::alias("a")
             ->field("a.id,a.user_id,u.avatar,u.nickname,u.gender,a.role,u.is_online,u.onlinetime")
-            ->join("hx_user u","a.user_id = u.id")
+            ->join("user u","a.user_id = u.id")
             ->where($where)
             ->autopage()
             ->order("a.role","desc")
@@ -476,38 +476,35 @@ class Family extends Api
         $userService->updateGuildMember(['user_id'=>$memberData['user_id']]);
 
         //从user表拿一些用户信息
-        $memberInfo = model('FamilyMember')
-            ->field('id,user_id,wealth,charm,gift_num,role,guild_id,createtime')
-            ->with(['user'=>function($uQuery){
-                $uQuery->field('id,avatar,nickname,gender,logintime,age_id,province_id,city_id');
-            }])->find($member_id);
+        $memberInfo = model('FamilyMember')->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('FamilyMember')->field('role')->where(["user_id"=>$this->auth->id,"guild_id"=>$memberInfo->guild_id])->find();
-        $memberInfo["my_role"] = !empty($myGuildMember) ? $myGuildMember['role'] : -1;
+        /*$myGuildMember = model('FamilyMember')->field('role')->where(["user_id"=>$this->auth->id,"guild_id"=>$memberInfo['guild_id']])->find();
+        $memberInfo["my_role"] = !empty($myGuildMember) ? $myGuildMember['role'] : 3;*/
 
         //几个比较大的值，改w单位
         $fieldArr = ['wealth','charm','gift_num'];
@@ -640,7 +637,7 @@ class Family extends Api
                 $list = model('GiftUserParty')->alias("a")
                     ->field('sum(a.value) as total_price,a.user_to_id,u.avatar,u.nickname,u.is_online,u.onlinetime')
                     ->where($where)
-                    ->join('hx_user u','u.id = a.user_to_id')
+                    ->join('user u','u.id = a.user_to_id')
                     ->group('a.user_to_id')
                     ->order('total_price',"desc")
                     ->autopage()