Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-hd/controllers/GhsController.php

@@ -471,8 +471,6 @@ class GhsController extends BaseController
         // 找出附近批发店，之后自动给建立关系，然后补充二个店之间的距离
         GhsClass::buildNearbyGhsRelations($this->shop['id'], $this->shop->pfShopId, $toLat, $toLnt);
 
-        noticeUtil::push("执行到这里。。。。5555");
-
         $shop = $this->shop;
         $mobile = $shop->mobile;
         $name = $shop->merchantName ?? '';

biz/ghs/classes/GhsClass.php

@@ -422,7 +422,6 @@ class GhsClass extends BaseClass
             $distance = $pair['distance'] ?? 0;
             // 距离大于60公里不建立关系
             if ($distance > 60 * 1000) {
-                noticeUtil::push("执行到这里，没有建立关系。。。。" . $distance . ' ' . $ghsShopId . ' ' . $shopId);
                 continue;
             }
 
@@ -430,11 +429,10 @@ class GhsClass extends BaseClass
             $ghs = self::build($ghsShopId, $shopId);
             if (!empty($ghs) && $distance > 0) {
                 $ghsId = $ghs['id'];
-                noticeUtil::push("执行到这里，建立一个：" . $ghsId);
+                noticeUtil::push("建立了一个关系：" . $ghsId);
                 self::updateById($ghsId, ['distance' => $distance]);
             }
         }
-        noticeUtil::push("执行到这里。。。。2");
         return true;
     }
 

common/components/mapUtil.php

@@ -57,7 +57,6 @@ class mapUtil
      */
     public static function calculateBatchDistance($origins, $toLnt, $toLat, $type = 1)
     {
-        noticeUtil::push("执行到这里：xxx");
         if (empty($origins)) {
             return [];
         }
@@ -76,7 +75,6 @@ class mapUtil
         $curl = new curl\Curl();
         $result = $curl->get($url);
         $result = \yii\helpers\Json::decode($result);
-        noticeUtil::push("执行到这里：".json_encode($result)." url:".$url);
         $distances = [];
         if (!empty($result['status']) && $result['status'] == 1 && !empty($result['results'])) {
             foreach ($result['results'] as $index => $res) {