达达回调

app-ghs/controllers/NoticeController.php

@@ -183,7 +183,8 @@ class NoticeController extends PublicController
                 //修改骑手姓名，手机号
                 $dmName = $postData['dm_name'] ?? '';
                 $dmMobile = $postData['dm_mobile'] ?? '';
-                OrderExpressClass::pickUp($orderInfo, $dmName, $dmMobile);
+                $model = OrderExpressClass::getByOrderSn($orderSn,true);
+                OrderExpressClass::pickUp($model, $dmName, $dmMobile);
                 break;
             case DadaExpressServices::ORDER_SENDING:
                 //配送中 todo

biz-ghs/order/classes/OrderExpressClass.php

@@ -63,6 +63,11 @@ class OrderExpressClass extends BaseClass
         return $order->save();
     }
 
+    public static function getByOrderSn($orderSn, $returnObj = false)
+    {
+        return self::getByCondition(['orderSn' => $orderSn], $returnObj);
+    }
+
     //修改快递状态
     public static function updateExpressStatus($orderSn, $status)
     {