影院列表返回结构调整

app/common/repositories/movie/CinemaRepository.php

@@ -46,9 +46,9 @@ class CinemaRepository extends BaseRepository
      */
     public function getLocalCinema($page, $limit, $longitude, $latitude, $where = [], $with = [], $order = 1)
     {
-        $field = 'cinema_sign,cinema_name,address,tel,city_sign,city_name,area_sign,area_name';
+        $field = 'cinema_sign,cinema_name,address,tel,city_sign,city_name,area_sign,area_name,longitude,latitude';
 
-        $result = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
+        $cinema_list = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
             $query->with($with);
         })->when($latitude && $longitude, function ($query) use ($field, $longitude, $latitude) {
             $query->field([$field, $this->distance($latitude, $longitude)]);
@@ -61,11 +61,17 @@ class CinemaRepository extends BaseRepository
                 $query->order('create_time desc');
             }
         })->field([$field])->select()->toArray();
-        foreach ($result as $key => $value) {
-            $result[$key]['distance'] = round($value['distance'] / 1000, 2);
+        foreach ($cinema_list as $key => $value) {
+            $cinema_list[$key]['distance'] = round($value['distance'] / 1000, 2);
         }
 
-        return $result;
+        $count = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
+            $query->with($with);
+        })->when($latitude && $longitude, function ($query) use ($field, $longitude, $latitude) {
+            $query->field([$field, $this->distance($latitude, $longitude)]);
+        })->count();
+
+        return compact('cinema_list', 'count');
     }
 
     /**