Merge branch 'master' into ls

app-ghs/controllers/AuthController.php

@@ -54,7 +54,7 @@ class AuthController extends PublicController
         $errCode = $pc->decryptData($encryptedData, $iv, $result);
         if ($errCode != 0) {
             Yii::$app->redis->executeCommand('DEL', [$cacheKey]);
-            noticeUtil::push($cacheKey . " 批发商 登录失败！！！！sessionKey异常", '15280215347');
+            //noticeUtil::push($cacheKey . " 批发商 登录失败！！！！sessionKey异常", '15280215347');
             util::success(['hasNoOpenId' => 1], '登录失败！');
         }
         $arr = Json::decode($result);

app-ghs/controllers/TestController.php

@@ -347,6 +347,7 @@ class TestController extends BaseController
             //['name' => '凯里壹号鲜花工厂', 'merchantNo' => '82271305992000N', 'wx' => [735074420, 735074312], 'zfb' => '2088660471452939'],
             ['name' => '平潭花天下', 'merchantNo' => '8223910599200DU', 'wx' => [742408710, 742408308], 'zfb' => '2088860472568840'],
             ['name' => '徐州贴心鲜花批发', 'merchantNo' => '82230305992005L', 'wx' => [770844003, 770842534], 'zfb' => '2088370485434992'],
+            ['name' => '海沧好多花换店', 'merchantNo' => '8223930599200CN', 'wx' => [772684174, 772684211], 'zfb' => '2088370864383343'],
             //['name' => '日照月下鲜花批发', 'merchantNo' => '82247705992002D', 'wx' => [759404451, 759404055], 'zfb' => '2088170264295192'],
             //['name' => '陆丰幸运花坊', 'merchantNo' => '82259705992001N', 'wx' => [762636401,762635754 ], 'zfb' => '2088170810827880'],
             //['name' => '阜阳芳棠鲜花批发', 'merchantNo' => '82237205992002Q', 'wx' => [733203298, 733203681], 'zfb' => '2088660084283241'],