Merge branch 'master' into dev

app-ghs/controllers/ExpressController.php

@@ -26,6 +26,7 @@ class ExpressController extends BaseController
         if ($order->mainId != $this->mainId) {
             util::fail('不是你的订单');
         }
+        $mainId = $this->mainId;
         $bizIdMap = dict::getDict('expressBizIdMap');
         if (getenv('YII_ENV') == 'production') {
             $bizId = $bizIdMap[$mainId] ?? 0;
@@ -118,6 +119,7 @@ class ExpressController extends BaseController
         if (empty($fhWlNo)) {
             util::fail('没有找到物流单');
         }
+        $mainId = $this->mainId;
         $bizIdMap = dict::getDict('expressBizIdMap');
         if (getenv('YII_ENV') == 'production') {
             $bizId = $bizIdMap[$mainId] ?? 0;

biz-ghs/express/classes/ExpressClass.php

@@ -76,7 +76,7 @@ class ExpressClass extends BaseClass
         $orderSn = $order->orderSn;
 
         $data = [
-            'deliveryId' => $deliveryId,
+            'delivery_id' => $deliveryId,
             'waybill_id' => $wayBillId,
             'order_id' => $orderSn
         ];

common/components/dict.php

@@ -11,7 +11,7 @@ class dict
         //mainId对应物流月结账号
         'expressBizIdMap' => [
             //长春花路鲜花，
-            '36707' => '4212960899',
+            '36707' => '4312960899',
             //龙岩花掌柜
             '50' => '5925274162',
         ],