使用app下单

app-ghs/controllers/ExpressController.php

@@ -120,18 +120,21 @@ class ExpressController extends BaseController
             $deliveryId = 'SF';
             $serviceType = 0;
             $serviceName = '标准快递';
+            //销花宝APP的appId
+            $wxAppId = 'wxb379c1f2f3ef705e';
         } else {
             $deliveryId = 'TEST';
             $bizId = 'test_biz_id';
             $serviceType = 1;
             $serviceName = 'test_service_name';
+            $wxAppId = 'wx4bf74abf453eb789';
         }
 
-        $admin = $this->admin;
-        $openId = $admin->ghsMiniOpenId ?? '';
-        if (empty($openId)) {
-            util::fail('请用小程序发单');
-        }
+//        $admin = $this->admin;
+//        $openId = $admin->ghsMiniOpenId ?? '';
+//        if (empty($openId)) {
+//            util::fail('请用小程序发单');
+//        }
 
         $shop = $this->shop;
         $shopName = $shop->shopName;
@@ -162,7 +165,7 @@ class ExpressController extends BaseController
 
         $params = [
             'bizId' => $bizId,// 快递公司客户编码或月结账号
-            'openId' => $openId,
+            //'openId' => $openId,
             'senderName' => $senderName,
             'senderMobile' => $senderMobile,
             'senderProvince' => $senderProvince,
@@ -188,6 +191,7 @@ class ExpressController extends BaseController
             'shopImgUrl' => $shopImgUrl,
             'staffId' => $staffId,
             'staffName' => $staffName,
+            'wxAppId' => $wxAppId,
         ];
         ExpressClass::addWayBill($params, $order);
         util::complete('操作成功');

biz-ghs/express/classes/ExpressClass.php

@@ -68,7 +68,7 @@ class ExpressClass extends BaseClass
         $ptStyle = dict::getDict('ptStyle', 'ghs');
 
         $orderSn = $params['orderSn'];
-        $openId = $params['openId'];
+        //$openId = $params['openId'];
         $deliveryId = $params['deliveryId'];
         $bizId = $params['bizId'];
         $customRemark = $params['customRemark'];
@@ -92,16 +92,20 @@ class ExpressClass extends BaseClass
         $serviceType = $params['serviceType'];
         $serviceName = $params['serviceName'];
         $shopImgUrl = $params['shopImgUrl'];
+        $wxAppId = $params['wxAppId'];
 
         $data = [
             // 订单信息
             'order_id' => $orderSn, // 商家订单ID，需唯一
-            'openid' => $openId, // 用户openid
+            //'openid' => $openId, // 用户openid
             'delivery_id' => $deliveryId, // 快递公司ID
             'biz_id' => $bizId, // 快递公司客户编码或月结账号
             'custom_remark' => $customRemark, // 备注
             //0表示已事先约定取件时间；否则请传预期揽件时间戳，需大于当前时间
             'expect_time' => 0,
+            //订单来源，0为小程序订单，2为App或H5订单，填2则不发送物流服务通知
+            'add_source' => 2,
+            'wx_appid' => $wxAppId,
             // 发件人信息
             'sender' => [
                 'name' => $senderName, // 发件人姓名