From d4094ba1c37ba2d7bfd39ce66beeeb5b2c845ab9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Mon, 22 Jan 2024 14:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
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 ba28d4bc..1195fd73 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -330,12 +330,12 @@ class MerchantDao extends BaseDao
             ->whereNotNull('long')
             ->field("mer_id,st_distance_sphere(point(`long`,`lat`), point({$lng}, {$lat})) as distance")
             ->having("distance <= {$distance}")
-            ->limit(50)->select();
-        if (empty($merchant)) {
+            ->limit(50)->select()->toArray();
+        if (empty($merchant) && $distance < 5000) {
             $merchant = $this->getValidMerchantByDistance($lat, $lng, 5000);
         }
         if (!empty($merchant)) {
-            return array_column($merchant->toArray(), 'mer_id');
+            return array_column($merchant, 'mer_id');
         }
         return [];
     }