From fb5dcbe144269e55bf6b0335bfb9a48f750c7013 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Fri, 29 Oct 2021 00:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0$lat=20&&=20$lng=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/AgentProductController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/AgentProductController.php b/app/Http/Controllers/Api/AgentProductController.php
index 9e241d1..6c442da 100644
--- a/app/Http/Controllers/Api/AgentProductController.php
+++ b/app/Http/Controllers/Api/AgentProductController.php
@@ -33,8 +33,9 @@ class AgentProductController extends Controller
 			$list = $list->whereIn('category_id', [$category_id, ...$this->get_category_child_ids($category_id)]);
 		}
 
-		// 距离排序，TODO 优化
-		$list = $list->addSelect('latitude', 'longitude', 'address', DB::raw(<<<SQL
+		// 距离排序
+		if ($lat && $lng) {
+			$list = $list->addSelect('latitude', 'longitude', 'address', DB::raw(<<<SQL
 round(
 	(((6371.393 * 2) * asin(
 		sqrt((
@@ -45,8 +46,9 @@ round(
 				*
 				pow( sin((((( {$lng} * 3.1415926 ) / 180 ) - (( `longitude` * pi()) / 180 )) / 2 )), 2 ))))
 	)) * 1000),0) AS `distance_m`
-SQL));
-
+SQL
+			));
+		}
 		$fields = ['id', 'sale', 'updated_at', 'price', 'distance_m']; //排序字段
 
 		$field = $fields[$type] ?? $fields[0];