From 25c31503e58913c53d6d5cffc95f557e4e18b291 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 22 Jan 2024 19:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/system/merchant/MerchantDao.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/common/dao/system/merchant/MerchantDao.php b/app/common/dao/system/merchant/MerchantDao.php
index 49de4657..df24fd43 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -323,7 +323,7 @@ class MerchantDao extends BaseDao
      * @param $distance 距离，单位米
      * @return mixed
      */
-    public function getValidMerchantByDistance($lat, $lng, $sort = false, $distance = 2000)
+    public function getValidMerchantByDistance($lat, $lng, $sort = false, $distance = 10000)
     {
         $query = Merchant::where('type_id', 'IN', ["10", "17"])
             ->where(['is_del' => 0, 'mer_state' => 1])
@@ -335,9 +335,9 @@ class MerchantDao extends BaseDao
         } else {
             $query->having("distance <= {$distance}")->limit(50);
         }
-        $merchant = $query->select()->toArray();
+        $merchant = $query->select();
         if (empty($merchant) && $distance < 5000 && !$sort) {
-            $merchant = $this->getValidMerchantByDistance($lat, $lng, $sort, 5000);
+            $merchant = $this->getValidMerchantByDistance($lat, $lng, $sort, 50000);
         }
         if (!empty($merchant)) {
             return array_column($merchant, 'mer_id');