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

app-ghs/controllers/TestController.php

@@ -493,7 +493,8 @@ class TestController extends BaseController
             //['name' => '梅州紫荆鲜花批发', 'merchantNo' => '82259605992002Q', 'wx' => [888071609, 888012368], 'zfb' => '2088580120134569'],
             //['name' => '阜阳润泽鲜花店', 'merchantNo' => '82237205992005M', 'wx' => [889493754, 889491770], 'zfb' => '2088580468011555'],
             //['name' => '惠达', 'merchantNo' => '8225810599201RH', 'wx' => [889521902, 889520798], 'zfb' => '2088580471883271'],
-            ['name' => '广州花粉工坊', 'merchantNo' => '8225810599201RY', 'wx' => [892145716, 892145723], 'zfb' => '2088580818465548'],
+            //['name' => '广州花粉工坊', 'merchantNo' => '8225810599201RY', 'wx' => [892145716, 892145723], 'zfb' => '2088580818465548'],
+            ['name' => '东莞我要花鲜花', 'merchantNo' => '8226020599200R8', 'wx' => [894794554, 894794917], 'zfb' => '2088680405463378'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],
             //['name' => '东莞惠雅鲜花（南城店）', 'merchantNo' => '8226020599200JK', 'wx' => [802315656, 802315755], 'zfb' => '2088870583889365'],
             //['name' => '沈阳市云花鲜花批发-专业化扫码', 'merchantNo' => '8222210599200BT', 'wx' => [796180053], 'zfb' => '2088770820458908'],

app-hd/controllers/ShopController.php

@@ -120,6 +120,9 @@ class ShopController extends BaseController
     {
         $get = Yii::$app->request->get();
         $mobile = $get['mobile'] ?? '';
+        if(empty($mobile)){
+            util::success(['has' => 0]);
+        }
         $shop = ShopClass::getByCondition(['mobile' => $mobile], true);
         if (!empty($shop)) {
             util::success(['has' => 1]);

biz-ghs/order/classes/OrderClass.php

@@ -1985,7 +1985,7 @@ class OrderClass extends BaseClass
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $orderInfo['mainId'] ?? 0;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119, 28500, 1294, 12925];
+            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644];
         } else {
             $map = [828];
         }
@@ -3044,7 +3044,7 @@ XL;
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $order->mainId;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119, 28500, 1294, 12925];
+            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644];
         } else {
             $map = [828];
         }

biz/ghs/classes/GhsClass.php

@@ -245,7 +245,7 @@ class GhsClass extends BaseClass
                 true
             );
             foreach ($founderStaffList as $mainId => $founderStaff) {
-				//分享批发店时，通过这个员工找到相应批发店
+                //分享批发店时，通过这个员工找到相应批发店
                 $founderStaffMap[$mainId] = intval($founderStaff->id ?? 0);
             }
         }
@@ -379,7 +379,7 @@ class GhsClass extends BaseClass
         }
 
         //要排除的批发店
-        $exclude = [64112, 795, 1405, 28051, 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, 91064, 413, 62421];
+        $exclude = [23667, 78556, 64112, 795, 1405, 28051, 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, 91064, 413, 62421];
         foreach ($nearbyShops as $key => $nearbyShop) {
             if (in_array($nearbyShop['id'], $exclude)) {
                 unset($nearbyShops[$key]);