xiaogang 4 jaren geleden
bovenliggende
commit
9a55ee06f1
2 gewijzigde bestanden met toevoegingen van 15 en 5 verwijderingen
  1. 1 3
      app/Http/Controllers/Api/UserController.php
  2. 14 2
      app/Services/UserService.php

+ 1 - 3
app/Http/Controllers/Api/UserController.php

xqd
@@ -365,9 +365,7 @@ class UserController extends Controller
      */
     public function looked_me(Request $request){
         try {
-            $user = auth('api')->user();
-            $param['user_id'] = $user->id;
-            $res =$this->userService->looked_me($param);
+            $res =$this->userService->looked_me();
         }catch (\Exception $exception){
             return $this->response->errorForbidden($exception->getMessage());
         }

+ 14 - 2
app/Services/UserService.php

xqd
@@ -40,13 +40,25 @@ class UserService
     /**
      * 看过我
      */
-    public function looked_me($param){
+    public function looked_me(){
+        $user = auth('api')->user();
         $res = UserLookModel::query()
             ->with(['user'=>function($query){
                 $query->select('id','sex','is_vip','tencent_im_user_id');
             },'user_info'])
-            ->where('look_id',$param['user_id'])
+            ->where('look_id',$user->id)
             ->paginate(request('perPage',20));
+        $res = $res->toArray();
+        foreach ($res['data'] as $k=>$v){
+            $v_user = User::query()->where(['id'=>$v['user_id']])->first();
+            if(!$v_user['latitude'] || !$v_user['longitude']){
+                $distance = 0;
+            }else{
+                $distance = GetDistance($user->latitude,$user->longitude,$v_user['latitude'],$v_user['longitude']);
+            }
+            $res['data'][$k]['distance'] = $distance;
+        }
+
         return $res;
     }