Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -814,10 +814,10 @@ class TestController extends BaseController
 
     public function actionClearQuery()
     {
-        $shopId = 10649;
+        $shopId = 31805;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店20');
+            util::stop('没有找到门店信息呢');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -830,7 +830,7 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CL29336665';
+        $orderSn = 'CL29366459';
         $queryParams = [
             'orderSn' => $orderSn,
             //'tradeNo' => '66222923861204',

biz-ghs/order/classes/OrderClass.php

@@ -3157,7 +3157,7 @@ XL;
                 }
             }
         }
-        noticeUtil::push("orderIds = {$sameTimeIdsStr}, sameTimeIdsStr: {$sameTimeIdsStr}");
+        //noticeUtil::push("orderIds = {$sameTimeIdsStr}, sameTimeIdsStr: {$sameTimeIdsStr}");
     }
 
 }