调整商品列表查询

2024-01-22 14:11:53 +08:00 · 2024-01-22 14:11:53 +08:00 · d4094ba1c3
commit d4094ba1c3
parent b2f006f51c
1 changed files with 3 additions and 3 deletions
--- 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 [];
    }