|
|
@@ -80,7 +80,7 @@ class CinemaSchedRepository extends BaseRepository
|
|
80
|
80
|
} else {//播放日期
|
|
81
|
81
|
$query->order('show_date desc');
|
|
82
|
82
|
}
|
|
83
|
|
- })->field([$field])->select()->toArray();
|
|
|
83
|
+ })->field([$field])->group('cinema_sign')->select()->toArray();
|
|
84
|
84
|
foreach ($cinema_sched as $key => $value) {
|
|
85
|
85
|
$cinema_sched[$key]['distance'] = isset($value['distance']) ? round($value['distance'] / 1000, 2) : 0.00;
|
|
86
|
86
|
$cinema_sched[$key]['show_date'] = date('m-d', $value['show_date']);
|
|
|
@@ -93,7 +93,7 @@ class CinemaSchedRepository extends BaseRepository
|
|
93
|
93
|
$query->with($with);
|
|
94
|
94
|
})->when($latitude && $longitude, function ($query) use ($field, $longitude, $latitude) {
|
|
95
|
95
|
$query->field([$field, $this->distance($latitude, $longitude)]);
|
|
96
|
|
- })->count();
|
|
|
96
|
+ })->group('cinema_sign')->count();
|
|
97
|
97
|
|
|
98
|
98
|
return compact('cinema_sched', 'count');
|
|
99
|
99
|
}
|
family