更新

app/Services/NoticeService.php

@@ -36,6 +36,7 @@ class NoticeService
             $query = $query->leftJoin('users','users_like.like_id','=','users.id')
                 ->leftJoin('users_info','users_like.like_id','=','users_info.user_id')
                 ->where('users_like.user_id',$param['user_id'])
+                ->where('users.is_distory',0)
                 ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
 
         }else{
@@ -46,6 +47,7 @@ class NoticeService
             $query = $query->leftJoin('users','users_like.user_id','=','users.id')
                 ->leftJoin('users_info','users_like.user_id','=','users_info.user_id')
                 ->where('users_like.like_id',$param['user_id'])
+                ->where('users.is_distory',0)
                 ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
 
 
@@ -85,6 +87,7 @@ class NoticeService
                 ->leftJoin('users','dynamic_zan.user_id','=','users.id')
                 ->leftJoin('users_info','dynamic_zan.user_id','=','users_info.user_id')
                 ->where('dynamic.user_id',$param['user_id'])
+                ->where('users.is_distory',0)
                 ->select(['dynamic_zan.id','dynamic_zan.atime','dynamic_zan.user_id','dynamic.content','dynamic.img_url','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
 
             //清除他赞了我未读状态
@@ -108,6 +111,7 @@ class NoticeService
                 ->leftJoin('users','dynamic.user_id','=','users.id')
                 ->leftJoin('users_info','dynamic.user_id','=','users_info.user_id')
                 ->where('dynamic_zan.user_id',$param['user_id'])
+                ->where('users.is_distory',0)
                 ->select(['dynamic_zan.id','dynamic_zan.atime','dynamic.user_id','dynamic.content','dynamic.img_url','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
         }
         $query = $query->orderByDesc('id')

app/Services/UserService.php

@@ -9,6 +9,7 @@ use App\Models\DynamicModel;
 use App\Models\PaymentLogModel;
 use App\Models\User;
 use App\Models\UserBlacklistModel;
+use App\Models\UserComment;
 use App\Models\UserInfoModel;
 use App\Models\UserInviteLog;
 use App\Models\UserLookModel;
@@ -50,6 +51,9 @@ class UserService
             },'user_info'])
             ->where('look_id',$user->id)
             ->whereNotIn('user_id',[$user->id])
+            ->whereHas("user",function($query){
+                $query->where('is_distory',0)->select();
+            })
             ->groupBy('user_id')
             ->paginate(request('perPage',20));
         $res = $res->toArray();
@@ -298,5 +302,28 @@ class UserService
         DynamicModel::query()->where('user_id',$user->id)->delete();
         return true;
     }
+
+
+    //注销用户（彻底删除用户数据）
+    public function delete_user(){
+        $user = auth('api')->user();
+        //删除用户
+        User::query()->where('id',$user->id)->delete();
+        //删除用户信息
+        UserInfoModel::query()->where('user_id',$user->id)->delete();
+        //删除用户黑名单
+        UserBlacklistModel::query()->where('user_id',$user->id)->delete();
+        //删除用户评价
+        UserComment::query()->where('user_id',$user->id)->delete();
+        //删除用户邀请记录
+        UserInviteLog::query()->where('user_id',$user->id)->delete();
+        //删除用户喜欢
+
+
+
+        //删除用户动态
+
+
+    }
 }