发货管理

app-ghs/controllers/ExpressController.php

@@ -106,6 +106,10 @@ class ExpressController extends BaseController
 
         $shopImgUrl = imgUtil::groupImg('logo4.png') . "?x-oss-process=image/resize,m_fill,h_80,w_80";
 
+        $staff = $this->shopAdmin;
+        $staffId = $staff->id;
+        $staffName = $staff->name ?? '';
+
         $params = [
             'bizId' => $bizId,// 快递公司客户编码或月结账号
             'openId' => $openId,
@@ -132,8 +136,10 @@ class ExpressController extends BaseController
             'serviceName' => $serviceName,
             'orderSn' => $orderSn,
             'shopImgUrl' => $shopImgUrl,
+            'staffId' => $staffId,
+            'staffName' => $staffName,
         ];
-        ExpressClass::addWayBill($params);
+        ExpressClass::addWayBill($params, $order);
     }
 
 }

biz-ghs/express/classes/ExpressClass.php

@@ -3,10 +3,13 @@
 namespace bizGhs\express\classes;
 
 
+use bizGhs\order\classes\OrderClass;
 use bizHd\base\classes\BaseClass;
+use bizHd\purchase\classes\PurchaseClass;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\dict;
 use common\components\expressUtil;
+use common\components\util;
 use Yii;
 
 class ExpressClass extends BaseClass
@@ -15,8 +18,14 @@ class ExpressClass extends BaseClass
     public static $baseFile = '\bizGhs\express\models\DeliveryOrder';
 
     //新增运单 ssh 20250703
-    public static function addWayBill($params)
+    public static function addWayBill($params, $order)
     {
+        $cgId = $order->purchaseId;
+        $cg = PurchaseClass::getById($cgId, true);
+        if (empty($cg)) {
+            util::fail('订单信息缺失');
+        }
+
         $merchant = WxOpenClass::getGhsWxInfo();
         $ptStyle = dict::getDict('ptStyle', 'ghs');
 
@@ -102,8 +111,52 @@ class ExpressClass extends BaseClass
                 'service_name' => $serviceName, // 服务名称
             ],
         ];
-        $ret = expressUtil::addOrder($merchant, $data, $ptStyle);
-        print_r($ret);
+        //$ret = expressUtil::addOrder($merchant, $data, $ptStyle);
+        $ret = [
+            'errcode' => 0,
+            'errmsg' => 'ok',
+            'order_id' => 'XSD_CS26323329',
+            'waybill_id' => 'XSD_CS26323329_waybill_id',
+            'delivery_resultcode' => 0,
+            'delivery_resultmsg' => 'ok',
+            'waybill_data' => [
+                'key' => 'TEST_mark',
+                'value' => '888-666-666',
+            ],
+            'is_correct_sender' => 0,
+            'is_correct_receiver' => 0,
+        ];
+        if ($ret['errcode'] == 0) {
+            $wayBillId = $ret['waybill_id'] ?? 0;
+            $wayBillName = '顺丰速运';
+            $order->fhWlSn = $deliveryId;
+            $order->fhWl = $wayBillName;
+            $order->fhWlNo = $wayBillId;
+            $order->fhWlStatus = 1;//已经叫物流
+            $order->save();
+
+            $cg->fhWlSn = $deliveryId;
+            $cg->fhWl = $wayBillName;
+            $cg->fhWlNo = $wayBillId;
+            $cg->fhWlStatus = 1;//已经叫物流
+            $cg->save();
+
+            $staffId = $params['staffId'];
+            $staffName = $params['staffName'];
+            $params = [
+                'fhType' => 0,
+                'fhWl' => '',
+                'fhWlNo' => '',
+                'staffId' => $staffId,
+                'staffName' => $staffName,
+            ];
+            OrderClass::orderSend($order, $params);
+
+        } else {
+            $code = $ret['errcode'] ?? '';
+            $msg = $ret['errmsg'] ?? '';
+            util::fail('提交失败，原因：' . $code . ' / ' . $msg);
+        }
     }
 
 }