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

app-ghs/controllers/TestController.php

@@ -467,7 +467,8 @@ class TestController extends BaseController
             //['name' => '昆明木鱼花草堂', 'merchantNo' => '8227310599200ZU', 'wx' => [874780341, 874779360], 'zfb' => '2088480009915486'],
             //['name' => '永城花鲜谷鲜花批发', 'merchantNo' => '82250605992008V', 'wx' => [874955479, 874955569], 'zfb' => '2088480025639193'],
             //['name' => '任丘蓝色雨鲜花批发', 'merchantNo' => '82214305992007M', 'wx' => [875610544, 875611929], 'zfb' => '2088480065124374'],
-            ['name' => '云南熙朵花卉', 'merchantNo' => '82273105992010C', 'wx' => [876755672, 876755475], 'zfb' => '2088480109605151'],
+            //['name' => '云南熙朵花卉', 'merchantNo' => '82273105992010C', 'wx' => [876755672, 876755475], 'zfb' => '2088480109605151'],
+            ['name' => '宿州温馨鲜花批发', 'merchantNo' => '82237405992003T', 'wx' => [880834087, 880834521], 'zfb' => '2088480300332087'],
             //['name' => '藏花林', 'merchantNo' => '8227310599200ZC', 'wx' => [868558224, 868558410], 'zfb' => '2088380587657250'],
             //['name' => '昆明藏花林花卉', 'merchantNo' => '8227310599200ZN', 'wx' => [869670880, 869668881], 'zfb' => '2088380691198135'],
             //['name' => '昆明藏花林鲜花', 'merchantNo' => '8227310599200ZJ', 'wx' => [869361939, 869362520], 'zfb' => '2088380669365761'],

biz/ghs/classes/GhsClass.php

@@ -348,7 +348,7 @@ class GhsClass extends BaseClass
         }
 
         //要排除的批发店
-        $exclude = [64112, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167, 88085];
+        $exclude = [64112, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167,15007,88085];
         foreach ($nearbyShops as $key => $nearbyShop) {
             if (in_array($nearbyShop['id'], $exclude)) {
                 unset($nearbyShops[$key]);