|
|
@@ -69,17 +69,17 @@ class Order extends ApiController
|
|
|
$lists = $this->model
|
|
|
->fieldRaw("* , TRUNCATE(( 6371 * acos (
|
|
|
cos ( radians(" . $param['lat'] . ") )
|
|
|
- * cos( radians( lat ) )
|
|
|
- * cos( radians( lng ) - radians(" . $param['lng'] . ") )
|
|
|
+ * cos( radians( depart_lat ) )
|
|
|
+ * cos( radians( depart_lng ) - radians(" . $param['lng'] . ") )
|
|
|
+ sin ( radians(" . $param['lat'] . ") )
|
|
|
- * sin( radians( lat ) )
|
|
|
+ * sin( radians( depart_lat ) )
|
|
|
)
|
|
|
), 2) AS distance")
|
|
|
->having('distance < 30')
|
|
|
->where(['status' => 2])
|
|
|
->where('created_at','<=', time() - $levelTime)
|
|
|
- ->where('lat', '>', 0)
|
|
|
- ->where('lng', '>', 0)
|
|
|
+ ->where('depart_lat', '>', 0)
|
|
|
+ ->where('depart_lng', '>', 0)
|
|
|
->where(function ($query) use ($categoryIds) {
|
|
|
if ($categoryIds) {
|
|
|
$query->whereIn('category_id', $categoryIds);
|