|
@@ -484,48 +484,55 @@ class Auth
|
|
|
public function getUserinfo()
|
|
|
{
|
|
|
$data = $this->_user->toArray();
|
|
|
-
|
|
|
$allowFields = $this->getAllowFields();
|
|
|
$userinfo = array_intersect_key($data, array_flip($allowFields));
|
|
|
+ $userinfo = array_merge($userinfo, Token::get($this->_token));
|
|
|
|
|
|
|
|
|
$userwallet = Db::name('user_wallet')->where('user_id',$this->_user->id)->find();
|
|
|
$userinfo['wallet'] = $userwallet;
|
|
|
|
|
|
- $userinfo = array_merge($userinfo, Token::get($this->_token));
|
|
|
-
|
|
|
|
|
|
$userinfo['follow_num'] = Db::name('user_follow')->where('uid',$this->id)->count('id');
|
|
|
|
|
|
$userinfo['fans_num'] = Db::name('user_follow')->where('follow_uid',$this->id)->count('id');
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
|
|
|
+
|
|
|
$usercar = "";
|
|
|
$userheader = "";
|
|
|
- $userlight = "";
|
|
|
- $userpop = "";
|
|
|
- $userandroidpop = "";
|
|
|
|
|
|
-
|
|
|
- $backResult = \app\common\model\AttireBack::field("file_image,gif_image,type,android_image")
|
|
|
- ->where(["user_id" => $this->_user->id, "is_using" => 1, "is_use" => 1, "duetime" => ["gt", time()]])->select();
|
|
|
+
|
|
|
+
|
|
|
+ $map = [
|
|
|
+ 'a.user_id' => $this->id,
|
|
|
+ 'a.is_using' => 1,
|
|
|
+ 'a.end_time' => ['gt',time()],
|
|
|
+ ];
|
|
|
+
|
|
|
+ $backResult = Db::name('user_decorate')->alias('a')
|
|
|
+ ->field('a.id,a.decorate_type,b.base_image,b.play_image')
|
|
|
+ ->join('decorate b', 'a.decorate_id = b.id')
|
|
|
+ ->where($map)->order('a.id desc')->select();
|
|
|
+ $backResult = list_domain_image($backResult,['base_image','play_image']);
|
|
|
|
|
|
if ($backResult) {
|
|
|
foreach ($backResult as $k => $v) {
|
|
|
- $v["type"] == 1 && $usercar = $v["gif_image"];
|
|
|
- $v["type"] == 2 && $userheader = $v["gif_image"];
|
|
|
+ $v['decorate_type'] == 1 && $usercar = $v['play_image'];
|
|
|
+ $v['decorate_type'] == 2 && $userheader = $v['play_image'];
|
|
|
}
|
|
|
}
|
|
|
- $userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,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();
|
|
|
|
|
|
-
|
|
|
+
|
|
|
$userinfo["usercar"] = $usercar;
|
|
|
$userinfo["userheader"] = $userheader;
|
|
|
|
|
|
+
|
|
|
+ $userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,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();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
$userInfoA = model('User')->getAppendData($userinfo);
|
|
|
$userInfo['age_text'] = $userInfoA['age_text'];
|
|
|
|
|
@@ -554,6 +561,7 @@ class Auth
|
|
|
$userinfo['is_cool'] = isset($user['is_cool']) ? $user['is_cool'] : 0;
|
|
|
$userinfo['is_manager'] = isset($user['is_manager']) ? $user['is_manager'] : 0;
|
|
|
$userinfo['is_stealth'] = isset($user['is_stealth']) ? $user['is_stealth'] : 0;
|
|
|
+
|
|
|
|
|
|
$guildField = 'g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,g.status';
|
|
|
$guildWhere['gm.user_id'] = $this->_user->id;
|
|
@@ -568,20 +576,7 @@ class Auth
|
|
|
}
|
|
|
$userinfo['guild_status'] = $guildStatus;
|
|
|
|
|
|
-
|
|
|
- $userinfo['can_egggift'] = 0;
|
|
|
- $where = [];
|
|
|
- $where["user_id"] = $this->_user->id;
|
|
|
- $where["mode"] = '-';
|
|
|
- $jewel_sum = Db::name('user_jewel_log')->where($where)->sum('value');
|
|
|
- $eggplay_paymoney_min = config('site.eggplay_paymoney_min');
|
|
|
- if($jewel_sum >= $eggplay_paymoney_min){
|
|
|
- $userinfo['can_egggift'] = 1;
|
|
|
- }
|
|
|
-
|
|
|
- if(config('site.eggnew_global_show') == 0){
|
|
|
- $userinfo['can_egggift'] = 0;
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
$userinfo['own_guild_id'] = 0;
|