订单

app-ghs/controllers/ExpressController.php

@@ -45,6 +45,7 @@ class ExpressController extends BaseController
         if ($order->mainId != $this->mainId) {
             util::fail('不是你的订单');
         }
+        $orderSn = $order->orderSn ?? '';
         $customId = $order->customId ?? 0;
         $custom = CustomClass::getById($customId, true);
         if (empty($custom)) {
@@ -127,6 +128,7 @@ class ExpressController extends BaseController
             'deliveryId' => $deliveryId,
             'serviceType' => $serviceType,
             'serviceName' => $serviceName,
+            'orderSn' => $orderSn,
         ];
         ExpressClass::addWayBill($params);
     }

biz-ghs/express/classes/ExpressClass.php

@@ -20,7 +20,7 @@ class ExpressClass extends BaseClass
         $merchant = WxOpenClass::getGhsWxInfo();
         $ptStyle = dict::getDict('ptStyle', 'ghs');
 
-        $orderId = $params['orderId'];
+        $orderSn = $params['orderSn'];
         $openId = $params['openId'];
         $deliveryId = $params['deliveryId'];
         $bizId = $params['bizId'];
@@ -47,7 +47,7 @@ class ExpressClass extends BaseClass
 
         $data = [
             // 订单信息
-            'order_id' => $orderId, // 商家订单ID，需唯一
+            'order_id' => $orderSn, // 商家订单ID，需唯一
             'openid' => $openId, // 用户openid
             'delivery_id' => $deliveryId, // 快递公司ID
             'biz_id' => $bizId, // 快递公司客户编码或月结账号