首页三个列表，重写

application/api/controller/Index.php

@@ -25,50 +25,31 @@ class Index extends Api
     //首页。推荐/附近/新人。三个用户列表
     public function nearuser()
     {
-//        if(empty($this->auth->longitude) || empty($this->auth->latitude)){
-//            // $this->success('success',[]);
-//            $this->error('请先开启定位');
-//        }
 
-//        $type = input('type', 0, 'intval'); //类型: 0附近 1缘分
         $type = input('type', 0, 'intval'); //类型: 0推荐 1附近 2新人
         $age_id = input('age_id', 0, 'intval'); //年龄段
-//        $agemin = input('agemin', 0, 'intval'); //最小年龄
-//        $agemax = input('agemax', 100, 'intval'); //最大年龄
 
-        //经过地图测算和公式推算，经度纬度 0.1即为11公里
+
         $map = [
             'user.gender' => $this->auth->gender == 1 ? 0 : 1,// 查询异性
             'user.status' => 1,
             'user.is_kefu' => 0,
             'user.id' => ['neq',$this->auth->id],
-//            'user.cityname' => $this->auth->cityname,
-//            'user.longitude' => ['between',[$this->auth->longitude - 0.1,$this->auth->longitude + 0.1]],
-//            'user.latitude' => ['between',[$this->auth->latitude - 0.1,$this->auth->latitude + 0.1]],
-//            'user.is_online|user.is_livebc' => 1, //完全不考虑直播与语聊的权重，只用活跃做排序
         ];
 
         //排序
         $order = 'user.is_active desc, user.logintime desc';
-        if (in_array($type,[0,1])) {
-            if ($this->auth->gender == 1) {
-                $order = 'user.is_active desc, user.logintime desc';
-            } else {
-                $order = 'user.is_active desc, user.logintime desc';
-            }
-        }
+
         if ($type == 0) {
-//            $map['user.cityname'] = $this->auth->cityname; //同城
             if ($this->auth->gender == 1) {
                 $map['user.is_recommend'] = 1;
             }
-            //$order = 'user.is_active desc, uw.pay_money desc,uw.get_money desc';
+
         } elseif ($type == 1) {
-//            $map['user.longitude'] = ['between',[$this->auth->longitude - 0.1,$this->auth->longitude + 0.1]];
-//            $map['user.latitude'] = ['between',[$this->auth->latitude - 0.1,$this->auth->latitude + 0.1]];
+
         } else {
             $map['user.createtime'] = ['egt', time() - 86400 * 30];
-//            $order = 'user.createtime desc';
+
         }
 
         if ($age_id > 0 && $age_id < 8) {
@@ -98,147 +79,47 @@ class Index extends Api
             $map['user.birthday'] = ['between', [time() - $agemax * 31536000, time() - $agemin * 31536000]];
         }
 
-        //dump($map);
         $field = [
-            'user.id','user.nickname','user.birthday','user.height','user.longitude','user.latitude','user.avatar','user.bio','user.gender','user.idcard_status', 'user.real_status', 'user.job', 'user.is_active', 'user.wages', 'user.is_recommend', 'user.cityname', 'user.hometown_cityid', 'user.is_hideaddress'
+            'user.id','user.nickname','user.birthday','user.height','user.avatar','user.bio','user.gender','user.idcard_status', 'user.real_status',
+            'user.is_active','user.is_recommend', 'user.cityname','user.is_hideaddress','uw.vip_endtime',
         ];
 
-        //$list = Db::name('user')->alias('user')->field($field)->where($map)->order($order)->autopage()->select();
         $list = Db::name('user')->alias('user')->field($field)
-            //->join('user_wallet uw','uw.user_id = user.id','LEFT')
+            ->join('user_wallet uw','uw.user_id = user.id','LEFT')
             ->where($map)->order($order)->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
 
-//        $mt_enum_job = Db::name('enum_job'); //职业
-//        $mt_enum_wages = Db::name('enum_wages'); //收入
-        $mt_user_wallet = Db::name('user_wallet'); //vip
-        $mt_user_greet = Db::name('user_greet'); //是否打过招呼
-//        $mt_wealth_level = Db::name('wealth_level'); //财富等级
-//        $mt_charm_level  = Db::name('charm_level'); //魅力等级
-        $mt_area = Db::name('area'); //城市
-        $time = time();
-
-        $hometown_cityid = [];//城市ids
-        $user_to_id = [];//打招呼ids
-        foreach ($list as $key=>$val){
-            $hometown_cityid[] = $val['hometown_cityid'];
-            $user_to_id[] = $val['id'];
-        }
-        // 城市
-        $mt_areas = $mt_area->field(['id','name'])->whereIn('id',$hometown_cityid)->select();
-        $mt_areas = array_column($mt_areas ?? [],'name','id');
+        //ids
+        $user_to_id = array_column($list,'id');
 
         // 是否打过招呼
-        $mt_user_greets = $mt_user_greet->field(['user_to_id','count(id) as num'])->where('user_id', $this->auth->id)->whereIn('user_to_id',$user_to_id)->group('user_to_id')->select();
-        $mt_user_greets = array_column($mt_user_greets ?? [],'num','user_to_id');
+        $mt_user_greet = Db::name('user_greet')->where('user_id', $this->auth->id)->whereIn('user_to_id',$user_to_id)->group('user_to_id')->column('user_to_id');
 
-        // 是否是vip
-        $mt_user_wallets = $mt_user_wallet->field(['id','user_id','vip_endtime','pay_money'])->whereIn('user_id',$user_to_id)->select();
-
-        // 财富等级
-//        $mt_wealth_levels = $mt_wealth_level->order('id desc')->column('value,image');
-        // 魅力等级
-//        $mt_charm_levels = $mt_charm_level->order('id desc')->column('value,image');
 
         foreach($list as $key => &$v) {
-            if ($this->auth->gender == 1) { //用户是男的
-                $age = birthtime_to_age($v['birthday']);
-//                $job = $mt_enum_job->where(['id' => $v['job_id']])->value('name');
-
-//                $v['desc'] = $distance . ' · ' . $age . '岁';
-                $v['desc'] = '';
-                if ($age > 0) {
-                    $v['desc'] = $age . '岁';
-                } else {
-                    $v['desc'] = '18岁';
-                }
-                if ($v['height']) {
-                    $v['desc'] .= ' | ' . $v['height'];
-                }
-//                if ($job) {
-//                    $v['desc'] .= ' · ' . $job;
-//                }
-                if ($type == 1) {
-//                    $distance = $this->calc_map_distance([$this->auth->longitude, $this->auth->latitude], [$v['longitude'], $v['latitude']]);
-//                    $v['desc'] .= ' | ' . $distance;
-                    $v['desc'] .= ' | 10km+';
-                }
-            } else {
-                if ($type != 1) {
-                    $v['desc'] = $v['bio'] ?: '暂未设置个性签名';
-                } else {
-                    $age = birthtime_to_age($v['birthday']);
-//                    $wages = $mt_enum_wages->where(['id' => $v['wages_id']])->value('name');
-
-//                $v['desc'] = $distance . ' · ' . $age . '岁';
-                    $v['desc'] = '';
-                    if ($age > 0) {
-                        $v['desc'] = $age . '岁';
-                    } else {
-                        $v['desc'] = '18岁';
-                    }
-                    if ($v['hometown_cityid']) {
-                        $hometown_city = $mt_areas[$v['hometown_cityid']] ?? '';
-                        $hometown_city = ($hometown_city && $v['is_hideaddress'] == 0) ? $hometown_city : '';
-                        if ($hometown_city) {
-                            $v['desc'] .= ' | ' . $hometown_city;
-                        }
-                    }
-//                    if ($wages) {
-//                        $v['desc'] .= ' · ' . $wages;
-//                    }
-                }
-            }
-            //查询是否打过招呼
-            $count = $mt_user_greets[$v['id']] ?? 0;
-            if ($count) {
-                $v['is_chat'] = 1; //是否打过招呼: 1是  0否
-            } else {
-                $v['is_chat'] = 0; //是否打过招呼: 1是  0否
-            }
+            //年龄
+            $age = birthtime_to_age($v['birthday']);
+            $age = $age > 0 ? $age : 18;
+            $v['age'] = $age;
 
-            $vip_endtime = 0;
-            $pay_money = 0;
-            foreach ($mt_user_wallets as $kk=>$vv){
-                if ($vv['user_id'] == $v['id']) {
-                    $vip_endtime = $vv['vip_endtime'];
-                    $pay_money = $vv['pay_money'];
-                    break;
-                }
+
+            //拼接年龄与身高
+            $v['desc'] = $age . '岁';
+
+            if ($v['height']) {
+                $v['desc'] .= ' | ' . $v['height'];
             }
 
-            if ($vip_endtime >= $time) {
-                $v['is_vip'] = 1; //是否是vip: 1是 0否
-            } else {
-                $v['is_vip'] = 0; //是否是vip: 1是 0否
+            if ($type == 2) {
+                $v['desc'] = $v['bio'] ? $v['bio'] : '暂未设置个性签名';
             }
-            //查询财富等级
-            /*if (!empty($mt_wealth_levels)) {
-                $name = '';
-                foreach ($mt_wealth_levels as $kkk=>$vvv){
-                    if ($pay_money > $kkk){
-                        $name = localpath_to_netpath($vvv);
-                        break;
-                    }
-                }
-                $v['wealth_level'] = $name;
-            } else {
-                $v['wealth_level'] = '';
-            }*/
-            //查询魅力等级
-            /*if (!empty($mt_charm_levels)) {
-                $name = '';
-                foreach ($mt_charm_levels as $kkk=>$vvv){
-                    if ($pay_money > $kkk){
-                        $name = localpath_to_netpath($vvv);
-                        break;
-                    }
-                }
-                $v['charm_level'] = $name;
-            } else {
-                $v['charm_level'] = '';
-            }*/
+
+            //VIP
+            $v['is_vip'] = $v['vip_endtime'] > time() ? 1 : 0;
+
+            //是否打过招呼: 1是  0否
+            $v['is_chat'] = in_array($v['id'],$mt_user_greet) ? 1 : 0;
         }
 
         $this->success('success',$list);