Merge branch 'master' into minus

app-mall/controllers/OrderController.php

@@ -499,7 +499,8 @@ class OrderController extends BaseController
             $response = $laResource->close($closeParams);
             if (!isset($response['code']) || $response['code'] != 'BBS00000') {
                 $msg = $response['msg'] ?? '';
-                noticeUtil::push('重点注意，散客买花更换单号没有成功，单号：' . $oldOrderSn . '，关单没有成功，' . $msg, '15280215347');
+                $lklSjNo = $shop->lklSjNo ?? '';
+                noticeUtil::push('重点注意，散客买花更换单号没有成功，单号：' . $oldOrderSn . '，关单没有成功，' . $msg . '。商户号：' . $lklSjNo, '15280215347');
                 util::fail('出错了哦，请重新下一单');
             }
 

app-mall/controllers/UserController.php

@@ -18,7 +18,7 @@ class UserController extends BaseController
 {
 
     //二维码收款使用
-    public $guestAccess = ['discount', 'mini-mobile', 'create'];
+    public $guestAccess = ['discount', 'mini-mobile', 'create','account-login'];
 
     //清空登录信息 ssh 20250215
     public function actionClearLogin()