Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -944,7 +944,7 @@ class TestController extends BaseController
     //交易查询 ssh 20231021
     public function actionTradeQuery()
     {
-        $shopId = 66030;
+        $shopId = 79108;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店，编号677230');
@@ -960,8 +960,8 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CG29795164';
-        $tradeNo = '66223122980070';
+        $orderSn = 'CG29798262';
+        $tradeNo = '66223126348611';
         $queryParams = [
             'orderSn' => $orderSn,
             'tradeNo' => $tradeNo,

app-hd/controllers/NoticeController.php

@@ -84,8 +84,8 @@ class NoticeController extends PublicController
         $remarkString = $orderTradeInfo['trade_remark'] ?? '';
         $remarkData = json_decode($remarkString, true);
         //流水类型
-        $capitalType = isset($remarkData['capitalType']) ? $remarkData['capitalType'] : null;
-        if (isset($capitalType) == false) {
+        $capitalType = $remarkData['capitalType'] ?? null;
+        if (!isset($capitalType)) {
             noticeUtil::push('支付回调失败了，没有找到capitalType，orderSn:' . $orderSn . ' remark:' . $remarkString, '15280215347');
             util::end();
         }
@@ -99,7 +99,7 @@ class NoticeController extends PublicController
                     $payWayType = dict::getDict('payWay', 'alipay');
                 }
                 if ($payMode == 'WECHAT') {
-                    $payWayType = dict::getDict('wxPay', 'alipay');
+                    $payWayType = dict::getDict('payWay', 'wxPay');
                 }
                 if (isset($payWayType) == false) {
                     noticeUtil::push('收银台支付回调验证失败了，没有找到支付方式，orderSn:' . $orderSn, '15280215347');