Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -970,7 +970,7 @@ class TestController extends BaseController
     //交易查询 ssh 20231021
     public function actionTradeQuery()
     {
-        $shopId = 38770;
+        $shopId = 40312;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店，编号677230');
@@ -986,7 +986,7 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CG30236626';
+        $orderSn = 'CG30304710';
         $tradeNo = '';
         $queryParams = [
             'orderSn' => $orderSn,

app-pt/controllers/WxController.php

@@ -180,7 +180,7 @@ class WxController extends PublicController
                         noticeUtil::push('trade_manage_remind_shipping', '15280215347');
                         break;
                     case 'trade_manage_order_settlement':
-                        noticeUtil::push('trade_manage_order_settlement', '15280215347');
+                        //noticeUtil::push('trade_manage_order_settlement', '15280215347');
                         break;
                     //关注
                     case 'subscribe':

app-pt/views/main/app.php

@@ -238,8 +238,8 @@
             const downloadUrls = {
                 'xiaohuabao': 'https://api.shop.hzghd.com/1278.apk', // 销花宝APP下载链接
                 'huazhanggui': 'https://api.shop.hzghd.com/229.apk', // 花掌柜APP下载链接
-                'huazhanggui_cashier': 'https://api.shop.hzghd.com/197.apk', // 花掌柜收银下载链接
-                'xiaohuabao_cashier': 'https://api.shop.hzghd.com/155.apk' // 销花宝收银下载链接
+                'huazhanggui_cashier': 'https://api.shop.hzghd.com/198.apk', // 花掌柜收银下载链接
+                'xiaohuabao_cashier': 'https://api.shop.hzghd.com/156.apk' // 销花宝收银下载链接
             };
             const url = downloadUrls[appType];
             if (url && url !== '#') {

common/components/sms.php

@@ -83,7 +83,8 @@ class sms
         if (empty($open)) {
             util::fail('没有找到平台');
         }
-        $name = isset($open['name']) ? $open['name'] : '花卉宝';
+        //$name = isset($open['name']) ? $open['name'] : '花卉宝';
+        $name = '花掌柜';
         $sign = isset($merchant) == true ? "【{$merchant['name']}】" : "【{$name}】";
         $msg = $sign . $msg;