用户信息/模型调整

application/api/controller/Usercenter.php

@@ -124,7 +124,11 @@ class UserCenter extends Common
         //动态
         //技能
         //礼物
-        $power = UserPower::where(['user_id'=>$user_id])->find();
+        if (empty($this->auth->power)) {
+            $power = UserPower::where(['user_id'=>$user_id])->find();
+        } else {
+            $power = $this->auth->power;
+        }
         $userInfo['user_power'] = $power;
         //访客记录
         if ($this->auth->id != $user_id) {

application/common/library/Auth.php

@@ -509,8 +509,8 @@ class Auth
                 $v["type"] == 4 && $userandroidpop = $v["android_image"];
             }
         }
-        $userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,pre_nickname,avatar,pre_avatar';
-        $user = model('User')->field($userField)->where(["id" => $this->_user->id])->with(['useralipay','userbank'])->find();
+        $userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,pre_nickname,avatar,pre_avatar,age_id,constellation_id,province_id,city_id,desc';
+        $user = model('User')->field($userField)->where(["id" => $this->_user->id])->with(['useralipay','userbank','userauth'])->find();
         // 获取我的推荐人的邀请码
         $preUserField = 'id,invite_no';
         $preUser = model('User')->field($preUserField)->where(["id" => $this->_user->pre_userid])->find();
@@ -528,14 +528,14 @@ class Auth
         $fieldArr = explode(',',$field);
         $fieldTextArr = ['age_text','constellation_text','province_text','city_text','friends_num','look_num'];
         $fieldArr = array_merge($fieldArr,$fieldTextArr);
-        $userData = model('User')->field($field)->with(['userauth'])->where(['id'=>$this->_user->id])->find();
+        //$userData = model('User')->field($field)->with(['userauth'])->where(['id'=>$this->_user->id])->find();
         foreach ($fieldArr as $key => $value) {
-            $userinfo[$value] = isset($userData[$value]) ? $userData[$value] : '';
+            $userinfo[$value] = isset($user[$value]) ? $user[$value] : '';
         }
         $userAlipay = isset($user['useralipay']) ? $user['useralipay'] : [];
         $userBank = isset($user['userbank']) ? $user['userbank'] : [];
-        $userinfo['realname'] = isset($userData['userauth']['realname']) ? $userData['userauth']['realname'] : '';
-        $userinfo['idcard'] = isset($userData['userauth']['idcard']) ? $userData['userauth']['idcard'] : '';
+        $userinfo['realname'] = isset($user['userauth']['realname']) ? $user['userauth']['realname'] : '';
+        $userinfo['idcard'] = isset($user['userauth']['idcard']) ? $user['userauth']['idcard'] : '';
         $userinfo['is_pay_pwd'] = !empty($user['pay_password']) ? 1 : 0;
         $userinfo['bind_wechat'] = !empty($user['openid']) ? 1 : 0;
         $userinfo['bind_alipay'] = !empty($userAlipay) ? 1 : 0;

application/common/model/User.php

@@ -30,7 +30,7 @@ class User extends Model
         $value = $value ? $value : (isset($data['age_id']) ? $data['age_id'] : 0);
         $list = [];
         if (!empty($value)) {
-            $list = model('Age')->find($value);
+            $list = model('Age')->field('name')->find($value);
         }
         return isset($list['name']) ? $list['name'] : '';
     }
@@ -40,7 +40,7 @@ class User extends Model
         $value = $value ? $value : (isset($data['constellation_id']) ? $data['constellation_id'] : 0);
         $list = [];
         if (!empty($value)) {
-            $list = model('Constellation')->find($value);
+            $list = model('Constellation')->field('name')->find($value);
         }
         return isset($list['name']) ? $list['name'] : '';
     }
@@ -51,7 +51,7 @@ class User extends Model
         $list = [];
         if (!empty($value)) {
             $where['id'] = $value;
-            $list = db('shopro_area')->where($where)->find();
+            $list = db('shopro_area')->field('name')->where($where)->find();
         }
         return isset($list['name']) ? $list['name'] : '';
     }
@@ -62,7 +62,7 @@ class User extends Model
         $list = [];
         if (!empty($value)) {
             $where['id'] = $value;
-            $list = db('shopro_area')->where($where)->find();
+            $list = db('shopro_area')->field('name')->where($where)->find();
         }
         return isset($list['name']) ? $list['name'] : '';
     }
@@ -73,7 +73,7 @@ class User extends Model
         $num = 0;
         if (!empty($value)) {
             $where['user_id'] = $value;
-            $userFansFollow = model('UserFansFollow')->where($where)->select();
+            $userFansFollow = model('UserFansFollow')->field('fans_id')->where($where)->select();
             $fansIds = array_column($userFansFollow,'fans_id');
             if (!empty($fansIds)) {
                 $fansWhere['user_id'] = ['in', $fansIds];
@@ -225,9 +225,10 @@ class User extends Model
         // 获取用户id
         $ids = array_keys($data);
         // 获取指定用户信息
+        $field = 'id,avatar,nickname,gender,level';
         $where = [];
         $where["id"] = ["in",$ids];
-        $userList = $this->where($where)->select();
+        $userList = $this->where($where)->field($field)->select();
         if($userList) {
             // 用户ID作为下标
             $userIdKeyList = [];
@@ -342,7 +343,7 @@ class User extends Model
         $levelconfigModel = Db::name('user_config_charm');
         $where = [];
         $where["empirical"] = ["elt",$empirical];
-        $userexplainstart = $levelconfigModel->where($where)->order("empirical","desc")->limit(1)->select();
+        $userexplainstart = $levelconfigModel->field('level')->where($where)->order("empirical","desc")->limit(1)->select();
 
         if(!$userexplainstart)  {
             $userexplainlevel = 0;
@@ -374,7 +375,7 @@ class User extends Model
         $levelconfigModel = Db::name('user_config_wealth');
         $where = [];
         $where["empirical"] = ["elt",$empirical];
-        $userexplainstart = $levelconfigModel->where($where)->order("empirical","desc")->limit(1)->select();
+        $userexplainstart = $levelconfigModel->field('level')->where($where)->order("empirical","desc")->limit(1)->select();
 
         if(!$userexplainstart)  {
             $userexplainlevel = 0;
@@ -406,7 +407,7 @@ class User extends Model
         $levelconfigModel = new \app\common\model\UserLevelConfig();
         $where = [];
         $where["empirical"] = ["elt",$empirical];
-        $userexplainstart = $levelconfigModel->where($where)->order("empirical","desc")->limit(1)->select();
+        $userexplainstart = $levelconfigModel->field('level')->where($where)->order("empirical","desc")->limit(1)->select();
 
         if(!$userexplainstart)  {
             $userexplainlevel = 0;