更新

biz/ghs/classes/GhsClass.php

@@ -333,13 +333,13 @@ class GhsClass extends BaseClass
     public static function buildNearbyGhsRelations($shopId, $pfShopId, $toLat, $toLnt)
     {
         if (empty($toLat) || empty($toLnt)) {
-            util::fail('门店未定位');
+            return false;
         }
 
         // 获取除虚拟外的所有批发店
-        $nearbyShops = ShopClass::getAllByCondition(['ptStyle'=>2, 'live'=>1, 'actTime>=' => strtotime('yesterday')], null, 'id, merchantName, lat, long');
+        $nearbyShops = ShopClass::getAllByCondition(['ptStyle' => 2, 'live' => 1, 'actTime>=' => strtotime('yesterday')], null, 'id, merchantName, lat, long');
         if (empty($nearbyShops)) {
-            return;
+            return false;
         }
 
         $origins = [];
@@ -348,7 +348,7 @@ class GhsClass extends BaseClass
             if ($nearbyShop['id'] == $pfShopId) {
                 continue;
             }
-            if ($nearbyShop['lat'] && $nearbyShop['long']) {
+            if (!empty($nearbyShop['lat']) && !empty($nearbyShop['long'])) {
                 $origins[] = [
                     'lat' => $nearbyShop['lat'],
                     'lng' => $nearbyShop['long'],
@@ -361,7 +361,7 @@ class GhsClass extends BaseClass
         }
 
         if (empty($origins)) {
-            return;
+            return false;
         }
 
         // 高德批量测距接口最多支持 100 个起点，需分批处理
@@ -387,7 +387,7 @@ class GhsClass extends BaseClass
             $ghsShopId = $nearbyShop['id'];
             $distance = $allDistances[$index] ?? 0;
             // 距离大于60公里不建立关系
-            if ($distance > 60*1000) {
+            if ($distance > 60 * 1000) {
                 continue;
             }
 
@@ -398,5 +398,6 @@ class GhsClass extends BaseClass
                 self::updateById($ghsId, ['distance' => $distance]);
             }
         }
+        return true;
     }
 }