|
@@ -23,19 +23,20 @@ class Userfollow extends Api
|
|
|
$list = Db::name('user_follow')
|
|
|
->alias('follow')
|
|
|
->join('user','follow.follow_uid = user.id','LEFT')
|
|
|
- ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status')
|
|
|
+ ->join('user_wallet uw','follow.follow_uid = uw.id','LEFT')
|
|
|
+ ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status,uw.vip_endtime')
|
|
|
->where('follow.uid',$this->auth->id)->where($where)->order('follow.id desc')->autopage()->select();
|
|
|
|
|
|
$list = list_domain_image($list,['avatar']);
|
|
|
$list = list_birthday_age($list);
|
|
|
|
|
|
if ($list) {
|
|
|
- $mt_user_wallet = Db::name('user_wallet'); //钱包
|
|
|
+ /*$mt_user_wallet = Db::name('user_wallet'); //钱包
|
|
|
$mt_wealth_level = Db::name('wealth_level'); //财富等级
|
|
|
- $mt_charm_level = Db::name('charm_level'); //魅力等级
|
|
|
+ $mt_charm_level = Db::name('charm_level'); //魅力等级*/
|
|
|
foreach ($list as &$val) {
|
|
|
//查询财富等级和魅力等级
|
|
|
- $wallet_info = $mt_user_wallet->where(['user_id' => $val['id']])->find();
|
|
|
+ /*$wallet_info = $mt_user_wallet->where(['user_id' => $val['id']])->find();
|
|
|
$wealth_level = $mt_wealth_level->where(['value' => ['elt', $wallet_info['pay_money']]])->order('id desc')->find();
|
|
|
if ($wealth_level) {
|
|
|
$val['wealth_level'] = $wealth_level['name'];
|
|
@@ -47,7 +48,8 @@ class Userfollow extends Api
|
|
|
$val['charm_level'] = $charm_level['name'];
|
|
|
} else {
|
|
|
$val['charm_level'] = '';
|
|
|
- }
|
|
|
+ }*/
|
|
|
+ $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -60,19 +62,20 @@ class Userfollow extends Api
|
|
|
$list = Db::name('user_follow')
|
|
|
->alias('follow')
|
|
|
->join('user','follow.uid = user.id','LEFT')
|
|
|
- ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status')
|
|
|
+ ->join('user_wallet uw','follow.follow_uid = uw.id','LEFT')
|
|
|
+ ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status,uw.vip_endtime')
|
|
|
->where('follow.follow_uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
|
|
|
|
|
|
$list = list_domain_image($list,['avatar']);
|
|
|
$list = list_birthday_age($list);
|
|
|
|
|
|
if ($list) {
|
|
|
- $mt_user_wallet = Db::name('user_wallet'); //钱包
|
|
|
+ /*$mt_user_wallet = Db::name('user_wallet'); //钱包
|
|
|
$mt_wealth_level = Db::name('wealth_level'); //财富等级
|
|
|
- $mt_charm_level = Db::name('charm_level'); //魅力等级
|
|
|
+ $mt_charm_level = Db::name('charm_level'); //魅力等级*/
|
|
|
foreach ($list as &$val) {
|
|
|
//查询财富等级和魅力等级
|
|
|
- $wallet_info = $mt_user_wallet->where(['user_id' => $val['id']])->find();
|
|
|
+ /*$wallet_info = $mt_user_wallet->where(['user_id' => $val['id']])->find();
|
|
|
$wealth_level = $mt_wealth_level->where(['value' => ['elt', $wallet_info['pay_money']]])->order('id desc')->find();
|
|
|
if ($wealth_level) {
|
|
|
$val['wealth_level'] = $wealth_level['name'];
|
|
@@ -84,7 +87,8 @@ class Userfollow extends Api
|
|
|
$val['charm_level'] = $charm_level['name'];
|
|
|
} else {
|
|
|
$val['charm_level'] = '';
|
|
|
- }
|
|
|
+ }*/
|
|
|
+ $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
|
|
|
}
|
|
|
}
|
|
|
|