Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -1356,8 +1356,8 @@ class OrderController extends BaseController
                                 $order->save();
                             }
 
-                            //xxx自己开单要打二次，有多处要修改搜索关键词 tow_print
-                            if (in_array($mainId, [0])) {
+                            //花镜 自己开单要打二次，有多处要修改搜索关键词 tow_print
+                            if (in_array($mainId, [76796])) {
                                 OrderClass::onlinePrint($order);
                                 $ext = $this->shopExt;
                                 if (isset($ext->printSn) && !empty($ext->printSn)) {

app-ghs/controllers/TestController.php

@@ -808,7 +808,7 @@ class TestController extends BaseController
     //零售订单查询 ssh 20231031
     public function actionLsTradeQuery()
     {
-        $shopId = 520;
+        $shopId = 726;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店21');
@@ -825,10 +825,10 @@ class TestController extends BaseController
         ];
         $laResource = new Lakala($params);
         $queryParams = [
-            'orderSn' => 'KD26648098',
-            //'tradeNo' => '66222010853306',
+            //'orderSn' => 'KD26649644',
+            'tradeNo' => '66222971142289',
         ];
-        $response = $laResource->query($queryParams, 0);
+        $response = $laResource->query($queryParams, 1);
         print_r($response);
         util::stop();
         if (isset($response['code']) && $response['code'] == 'BBS00000') {

app-hd/controllers/NoticeController.php

@@ -216,8 +216,8 @@ class NoticeController extends PublicController
                                 $order->save();
 
                                 if (getenv('YII_ENV') == 'production') {
-                                    //福州我要花、花路鲜花批发、小齐鲜花打二次小票，有多处要修改搜索关键词tow_print
-                                    $needTwoPrint = [7538, 36707];
+                                    //福州我要花、花路鲜花批发、小齐鲜花、花镜打二次小票，有多处要修改搜索关键词tow_print
+                                    $needTwoPrint = [7538, 36707,76796];
                                 } else {
                                     $needTwoPrint = [644];
                                 }
@@ -437,8 +437,8 @@ class NoticeController extends PublicController
                                 }
 
                                 if (getenv('YII_ENV') == 'production') {
-                                    //福州我要花、花路鲜花批发打二次小票，有多处要修改搜索关键词tow_print
-                                    $needTwoPrint = [7538, 36707];
+                                    //福州我要花、花路鲜花批发、花镜打二次小票，有多处要修改搜索关键词tow_print
+                                    $needTwoPrint = [7538, 36707,76796];
                                 } else {
                                     $needTwoPrint = [];
                                 }

app-hd/controllers/PurchaseController.php

@@ -813,8 +813,8 @@ class PurchaseController extends BaseController
                             $order->save();
                         }
 
-                        //xxx 打二次小票，有多处要修改搜索关键词tow_print
-                        if (in_array($order->mainId, [0])) {
+                        //花镜 打二次小票，有多处要修改搜索关键词tow_print
+                        if (in_array($order->mainId, [76796])) {
                             OrderClass::onlinePrint($order);
                             $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
                             if (isset($ext->printSn) && !empty($ext->printSn)) {