Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -127,7 +127,6 @@ class ConsoleController extends BaseController
      */
     public function actionGetYesterdayIncome()
     {
-        util::success(['income' => 0]);
         if (empty($this->mainId)) {
             util::success(['income' => 0]);
             return;
@@ -178,7 +177,7 @@ class ConsoleController extends BaseController
         //$notice[] = ['title' => '客户多个订单开始支持一键分享', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
         //$notice[] = ['title' => '如果你发现一个问题很重要，一直没给你处理，在小群多反应几次，用反应次数强调重要性，目前批发店多反应问题多，都在排队。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
-        $notice[] = ['title' => '新订单通知暂时停用，昨日收入不显示', 'action' => '', 'page' => ''];
+        $notice[] = ['title' => '新订单通知暂时停用', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '急事请连续打二次电话 15280215347', 'action' => '', 'page' => ''];
 
         $mainId = $this->mainId;

app-ghs/controllers/TestController.php

@@ -502,7 +502,8 @@ class TestController extends BaseController
             //['name' => '昆明花满禾鲜花', 'merchantNo' => '82273105992012G', 'wx' => [898442463, 898442140], 'zfb' => '2088780050977551'],
             //['name' => '昆明洋洋的花', 'merchantNo' => '82273105992012L', 'wx' => [899641357, 899640792], 'zfb' => '2088780116043804'],
             //['name' => '莆田我要花', 'merchantNo' => '82239405992009K', 'wx' => [900215179, 900215380], 'zfb' => '2088780157526852'],
-            ['name' => '广州福隆花卉', 'merchantNo' => '8225810599201T8', 'wx' => [900532403, 900531348], 'zfb' => '2088780172288658'],
+            //['name' => '广州福隆花卉', 'merchantNo' => '8225810599201T8', 'wx' => [900532403, 900531348], 'zfb' => '2088780172288658'],
+            ['name' => '张家口万花汇', 'merchantNo' => '82213805992008D', 'wx' => [901551070, 901551037], 'zfb' => '2088780253600870'],
             //['name' => '厦门纯彩花艺', 'merchantNo' => '8223930599200LD', 'wx' => [894984230, 894983290], 'zfb' => '2088680439152343'],
             //['name' => '东莞我要花鲜花', 'merchantNo' => '8226020599200R8', 'wx' => [894794554, 894794917], 'zfb' => '2088680405463378'],
             //['name' => '镇江花珩鲜花批发', 'merchantNo' => '82231405992003N', 'wx' => [894925711, 894925626], 'zfb' => '2088680426877183'],