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

app-ghs/controllers/TestController.php

@@ -398,6 +398,7 @@ class TestController extends BaseController
             //['name' => '济南伟伟鲜花批发', 'merchantNo' => '8224510599200EL', 'wx' => [789073494, 789074603], 'zfb' => '2088670850497224'],
             //['name' => '赣州紫荆鲜花批发', 'merchantNo' => '82242805992004J', 'wx' => [790052021, 790051859], 'zfb' => '2088670969143838'],
             //['name' => '莆田鲜花闪送', 'merchantNo' => '82239405992005W', 'wx' => [808858266, 808858114], 'zfb' => '2088970298325670'],
+            ['name' => '安溪中花花卉', 'merchantNo' => '8223970599200DY', 'wx' => [812909945, 812909506], 'zfb' => '2088970630094026'],
             ['name' => '水头十里花田鲜花', 'merchantNo' => '8223970599200DX', 'wx' => [812680599, 812680180], 'zfb' => '2088970615112103'],
             ['name' => '泉州沙丘鲜花批发', 'merchantNo' => '8223970599200DV', 'wx' => [812653846, 812652998], 'zfb' => '2088970612345533'],
             //['name' => '昆明小向鲜花', 'merchantNo' => '8227310599200UX', 'wx' => [811911098, 811911180], 'zfb' => '2088970555233957'],

app-hd/controllers/ApplyController.php

@@ -132,7 +132,7 @@ class ApplyController extends BaseController
             $ghsShopAdminId = $post['ghsShopAdminId'] ?? 0;
             $hdShopAdminId = $post['hdShopAdminId'] ?? 0;
             if (empty($ghsShopAdminId) && empty($hdShopAdminId)) {
-                util::fail('批发店推荐才能注册，编号：' . $ghsShopAdminId . ' ' . $hdShopAdminId);
+                //util::fail('批发店推荐才能注册，编号：' . $ghsShopAdminId . ' ' . $hdShopAdminId);
             }
 
             $shopName = $post['name'] ?? '';