首页和推荐

application/api/controller/Index.php

@@ -80,19 +80,18 @@ class Index extends Api
             'user.gender',
             'user.birthday',
             'user.cityname',
-            'user.attribute',
-            'user.is_active',
             'user.longitude',
             'user.latitude',
-            'user.cityname',
             'user.attribute',
 
             'wallet.vip_endtime',
             '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(user.longitude,user.latitude))*111195) as distance',
+            'active.requesttime',
         ];
         $list = Db::name('user')->alias('user')->field($field)
             ->join('user_wallet wallet','user.id = wallet.user_id','LEFT')
             ->join('user_power power' ,'user.id = power.user_id','LEFT')
+            ->join('user_active active' ,'user.id = active.user_id','LEFT')
             ->where($where)
             ->order('distance asc')
             ->autopage()
@@ -104,12 +103,114 @@ class Index extends Api
             $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
 
             $val['distance'] = bcdiv(intval($val['distance']),1000,2).'km';
+
+            $val['active_info'] = $this->user_activeinfo($val['id'],$val['requesttime']);
         }
 
         $this->success(1,$list);
     }
 
-    public function tuijian(){}
+    public function tuijian(){
+        $cityname = input('cityname',$this->auth->cityname);
+
+        $where = [
+            'user.id' => ['neq',$this->auth->id],
+            'user.status' => 1,
+            'user.photo_images' => ['neq',''],
+            'user.cityname' => $cityname,
+            'power.yinshen' => 0,
+        ];
+
+        //推荐条件
+        $where_tuijian = [
+            'user.idcard_status' => 1,
+            'user.is_tuijian'    => 1,
+        ];
+        if(config('site.index_tuijian_vip_limit') == 1){
+            $where_tuijian['wallet.vip_endtime'] = ['gt',time()];
+        }
+        //推荐条件
+
+        $where = array_merge($where,$where_tuijian);
+
+        //性别
+        $gender = input('gender','all');
+        if($gender != 'all'){
+            $where['user.gender'] = $gender;
+        }
+        //属性
+        $attribute = input('attribute','all');
+        if($attribute != 'all' && $attribute != 'BOTH'){
+            $where['user.attribute'] = $attribute;
+        }
+        //排除黑名单的
+        $black_ids = Db::name('user_black')->where(['uid'=>$this->auth->id])->column('black_uid');
+        if(!empty($black_ids)){
+            $where['user.id'] = ['NOTIN',$black_ids];
+        }
+        //年龄
+        $agemin = input('agemin',18);
+        if($agemin > 18){
+            $where['user.birthday'] = ['lt',time()-$agemin*31536000];
+        }
+        $agemax = input('agemax',100);
+        if($agemax < 100){
+            $where['user.birthday'] = ['gt',time()-$agemax*31536000];
+        }
+        if($agemin > 18 && $agemax < 100){
+            $where['user.birthday'] = ['between',[time()-$agemax*31536000,time()-$agemin*31536000]];
+        }
+        //距离
+        $distancemin = input('distancemin',0);
+        if($distancemin > 0){
+            $where['distance'] = ['gt',$distancemin];
+        }
+        $distancemax = input('distancemax',0);
+        if($distancemax > 0){
+            $where['distance'] = ['lt',$distancemax];
+        }
+        if($distancemin > 0 && $distancemax > 0){
+            $where['distance'] = ['between',[$distancemin,$distancemax]];
+        }
+
+        $field = [
+            'user.id',
+            'user.username',
+            'user.nickname',
+            'user.avatar',
+            'user.photo_images',
+            'user.gender',
+            'user.birthday',
+            'user.cityname',
+            'user.longitude',
+            'user.latitude',
+            'user.attribute',
+
+            'wallet.vip_endtime',
+            '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(user.longitude,user.latitude))*111195) as distance',
+            'active.requesttime',
+        ];
+        $list = Db::name('user')->alias('user')->field($field)
+            ->join('user_wallet wallet','user.id = wallet.user_id','LEFT')
+            ->join('user_power power' ,'user.id = power.user_id','LEFT')
+            ->join('user_active active' ,'user.id = active.user_id','LEFT')
+            ->where($where)
+            ->order('distance asc')
+            ->autopage()
+            ->select();
+        $list = list_domain_image($list,['avatar','photo_images']);
+        foreach($list as $key => &$val){
+            $val['age'] = birthtime_to_age($val['birthday']);
+            $val['photo_images'] = explode(',',$val['photo_images'])[0];
+            $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+
+            $val['distance'] = bcdiv(intval($val['distance']),1000,2).'km';
+
+            $val['active_info'] = $this->user_activeinfo($val['id'],$val['requesttime']);
+        }
+
+        $this->success(1,$list);
+    }
 
 
 

application/api/controller/Usercenter.php

@@ -103,7 +103,7 @@ class Usercenter extends Api
         }
 
         //活跃，在线
-        $userinfo['is_active'] = $this->user_isactive($uid);
+        $userinfo['active_info'] = $this->user_activeinfo($uid);
 
         //用户权限
         //$userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();

application/common/controller/Api.php

@@ -441,17 +441,25 @@ class Api
 
     //获取用户是否活跃，7200秒，2小时
     //1活跃，0不活跃
-    protected function user_isactive($user_id = 0){
-        if(!$user_id && $this->auth->isLogin()){
-            $user_id = $this->auth->id;
+    protected function user_activeinfo($user_id,$requesttime = 0){
+
+        if(empty($requesttime)){
+            $requesttime = db('user_active')->where('user_id',$user_id)->value('requesttime');
         }
-        $requesttime = db('user_active')->where('user_id',$user_id)->value('requesttime');
 
-        $active = 1;
+        $result = [
+            'is_active' => 1,
+            'active_text' => get_last_time($requesttime).'在线',
+        ];
+
         if(time() - $requesttime > 7200){
-            $active = 0;
+            $result = [
+                'is_active' => 0,
+                'active_text' => '离线',
+            ];
         }
-        return $active;
+
+        return $result;
     }
 
     //用户是否vip，1是，0否

application/extra/site.php

@@ -64,4 +64,5 @@ return array (
   'min_withdrawal_money' => '1',
   'max_withdrawal_money' => '10000',
   'withdrawal_plat_bili' => '6',
+  'index_tuijian_vip_limit' => '0',
 );