|
@@ -957,7 +957,7 @@ class User extends Api
|
|
|
$where['a.user_id'] = $user_id;
|
|
|
$where['a.createtime'] = ['egt', time() - 86400];
|
|
|
$res = \app\common\model\UserFate::alias("a")
|
|
|
- ->field("a.id,u.id as user_id,u.avatar,u.nickname,u.age,u.constellation,u.hobby_ids,u.profession,u.wechat,u.copy_mobile,u.mobile")
|
|
|
+ ->field("a.id,u.id as user_id,u.avatar,u.nickname,u.age,u.constellation,u.hobby_ids,u.profession,u.wechat,u.copy_mobile,u.mobile,u.gender")
|
|
|
->join("hx_user u","u.id = a.fate_user_id")
|
|
|
->where($where)
|
|
|
->order("a.createtime",'desc')
|
|
@@ -1002,7 +1002,7 @@ class User extends Api
|
|
|
//
|
|
|
// if(!$userInfo){
|
|
|
// 获取用户信息
|
|
|
- $field = 'id,avatar,nickname,is_goddess,is_auth,recharge_auth,vipStatus(vip_duetime) as is_vip,age,lng,lat,city_name,district_name,constellation,hobby_ids,profession,declaration,wechat,income,copy_mobile,mobile,is_auth_person';
|
|
|
+ $field = 'id,avatar,nickname,is_goddess,is_auth,recharge_auth,vipStatus(vip_duetime) as is_vip,age,lng,lat,city_name,district_name,constellation,hobby_ids,profession,declaration,wechat,income,copy_mobile,mobile,is_auth_person,gender';
|
|
|
$userInfo = \app\common\model\User::field($field)->where(['id'=>$user_id])->find();
|
|
|
$userInfo['hobby_ids'] = \app\common\model\Hobby::getHobbyNames($userInfo['hobby_ids']);
|
|
|
// 获取是否有眼缘
|