Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -495,7 +495,8 @@ class TestController extends BaseController
             //['name' => '惠达', 'merchantNo' => '8225810599201RH', 'wx' => [889521902, 889520798], 'zfb' => '2088580471883271'],
             //['name' => '广州花粉工坊', 'merchantNo' => '8225810599201RY', 'wx' => [892145716, 892145723], 'zfb' => '2088580818465548'],
             //['name' => '张家口小武鲜花批发', 'merchantNo' => '82213805992007R', 'wx' => [894997028, 894996929], 'zfb' => '2088680439799041'],
-            ['name' => '淮北花述语鲜花批发', 'merchantNo' => '82236605992001E', 'wx' => [895627520, 895627914], 'zfb' => '2088680541422679'],
+            //['name' => '淮北花述语鲜花批发', 'merchantNo' => '82236605992001E', 'wx' => [895627520, 895627914], 'zfb' => '2088680541422679'],
+            ['name' => '泉州馨喜鲜花批发', 'merchantNo' => '8223970599200KD', 'wx' => [896099124, 896098673], 'zfb' => '2088680670320387'],
             //['name' => '厦门纯彩花艺', 'merchantNo' => '8223930599200LD', 'wx' => [894984230, 894983290], 'zfb' => '2088680439152343'],
             //['name' => '东莞我要花鲜花', 'merchantNo' => '8226020599200R8', 'wx' => [894794554, 894794917], 'zfb' => '2088680405463378'],
             //['name' => '镇江花珩鲜花批发', 'merchantNo' => '82231405992003N', 'wx' => [894925711, 894925626], 'zfb' => '2088680426877183'],
@@ -1557,4 +1558,4 @@ class TestController extends BaseController
 
     }
 
-}
+}

console/controllers/CustomDistController.php

@@ -33,7 +33,7 @@ class CustomDistController extends Controller
      * @var int[]
      */
     private static $fillMainIds = [
-        644
+        25119, 2644,10652,2084,89473,50
     ];
 
     /** @var int 每批处理的客户数 */