好友待审核列表，拒绝好友申请

application/api/controller/Userfollow.php

@@ -100,10 +100,9 @@ class Userfollow extends Api
     }
 
     //好友审核列表。粉丝列表改的。关注了我，我还没关注他的
-    //接口转移了，使用 newfriend_list
+    //接口废弃，使用 newfriend_list
     public function my_fans_unfollow_list(){
 
-        $this->newfriend_list();
         //我的关注uids
         $my_follow_uids = $this->my_follow_uids();
 
@@ -135,36 +134,39 @@ class Userfollow extends Api
         //我的关注uids
         $my_follow_uids = $this->my_follow_uids();
 //        dump($my_follow_uids);
-        //向我发起好友消息的人，未读
-        $user_ids = Db::name('message')->where('infotype','newfriend')->where('user_id',$this->auth->id)->where('status',0)->order('id desc')->column('infotype_id');
-//        dump($user_ids);
-        $list = [];
-        if(!empty($user_ids)){
-            $user_ids_str = implode(',',$user_ids);
-            $list = Db::name('user')->alias('user')
-                ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-                ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
-                ->where('user.id','IN',$user_ids)
-                ->where('user.id','NOT IN',$my_follow_uids)
-                ->orderRaw('field(user.id,'.$user_ids_str.')')->autopage()->select();
-
-            $list = list_domain_image($list,['avatar']);
-            $list = list_birthday_age($list);
-
-            if(!empty($list)){
-                foreach($list as $key => &$val){
-                    //用户vip
-                    $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                    unset($val['vip_endtime']);
-                    //是否关注
-                    $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
-                }
+
+        $list = Db::name('message')->alias('msg')
+            ->join('user user','user.id = msg.infotype_id','LEFT')
+            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
+            ->field('msg.id as msg_id,user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->where(['msg.infotype'=>'newfriend','msg.user_id'=>$this->auth->id,'msg.status'=>0])
+            ->where('msg.infotype_id','NOT IN',$my_follow_uids)
+            ->order('msg.id desc')->autopage()->select();
+
+        $list = list_domain_image($list,['avatar']);
+        $list = list_birthday_age($list);
+
+        if(!empty($list)){
+            foreach($list as $key => &$val){
+                //用户vip
+                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                unset($val['vip_endtime']);
+                //是否关注
+                $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
             }
         }
 
         $this->success('success',$list);
     }
 
+    //拒绝好友请求
+    public function refuse_newfriend(){
+        $id = input('msg_id',0);
+
+        Db::name('message')->where('id',$id)->update(['status'=>1]);
+        $this->success('已拒绝');
+    }
+
 
     //关注某人
     public function follow_one(){