收银台增加编号

app-hd/controllers/NoticeController.php

@@ -56,6 +56,7 @@ class NoticeController extends PublicController
 
         $postData = json_decode($postStr, true);
         $orderSn = $postData['out_order_no'] ?? '';
+        $merchant_no = $postData['merchant_no'] ?? '';
         $orderTradeInfo = $postData['order_trade_info'] ?? [];
         $payMode = $orderTradeInfo['pay_mode'] ?? null;
         if (empty($payMode)) {
@@ -106,7 +107,7 @@ class NoticeController extends PublicController
                     noticeUtil::push('收银台支付回调验证失败了，没有找到支付方式，orderSn:' . $orderSn, '15280215347');
                     util::end();
                 }
-                $attach = '';
+                $attach = 'merchant_no=' . $merchant_no;
                 payUtil::thirdPay($payWayType, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
                 $transaction->commit();
             }
@@ -146,7 +147,7 @@ class NoticeController extends PublicController
                     if (isset($cg->book) && $cg->book == 0) {
                         $ghsShopId = $order->shopId ?? 0;
                         if (getenv('YII_ENV') == 'production') {
-                            $specialList = [10649, 8042, 16454, 21319, 33668,43274];
+                            $specialList = [10649, 8042, 16454, 21319, 33668, 43274];
                         } else {
                             $specialList = [36523];
                         }
@@ -203,7 +204,7 @@ class NoticeController extends PublicController
                             //有几个地方要同步去修改
                             if (getenv('YII_ENV') == 'production') {
                                 //源花汇、盛丰不自动打小票，关键词mall_order_no_auto_print
-                                $mallOrderNoPrint = [10536,44282];
+                                $mallOrderNoPrint = [10536, 44282];
                             } else {
                                 $mallOrderNoPrint = [];
                             }
@@ -371,7 +372,7 @@ class NoticeController extends PublicController
                     if (isset($cg->book) && $cg->book == 0) {
                         $ghsShopId = $order->shopId ?? 0;
                         if (getenv('YII_ENV') == 'production') {
-                            $specialList = [10649, 8042, 16454, 21319, 33668,43274];
+                            $specialList = [10649, 8042, 16454, 21319, 33668, 43274];
                         } else {
                             $specialList = [36523];
                         }
@@ -428,7 +429,7 @@ class NoticeController extends PublicController
                             //有几个地方要同步去修改
                             if (getenv('YII_ENV') == 'production') {
                                 //源花汇、盛丰不自动打小票，关键词mall_order_no_auto_print
-                                $mallOrderNoPrint = [10536,44282];
+                                $mallOrderNoPrint = [10536, 44282];
                             } else {
                                 $mallOrderNoPrint = [];
                             }
@@ -565,7 +566,7 @@ class NoticeController extends PublicController
                             //有几个地方要同步去修改
                             if (getenv('YII_ENV') == 'production') {
                                 //源花汇、盛丰不自动打小票，关键词mall_order_no_auto_print
-                                $mallOrderNoPrint = [10536,44282];
+                                $mallOrderNoPrint = [10536, 44282];
                             } else {
                                 $mallOrderNoPrint = [];
                             }
@@ -803,7 +804,7 @@ class NoticeController extends PublicController
                                 //有几个地方要同步去修改
                                 if (getenv('YII_ENV') == 'production') {
                                     //源花汇、盛丰不自动打小票，关键词mall_order_no_auto_print
-                                    $mallOrderNoPrint = [10536,44282];
+                                    $mallOrderNoPrint = [10536, 44282];
                                 } else {
                                     $mallOrderNoPrint = [];
                                 }