完善达达

app-ghs/controllers/NoticeController.php

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

biz-ghs/order/classes/OrderExpressClass.php

@@ -2,6 +2,7 @@
 
 namespace bizGhs\order\classes;
 
+use bizGhs\express\services\DadaExpressServices;
 use Yii;
 use bizGhs\base\classes\BaseClass;
 
@@ -23,8 +24,9 @@ class OrderExpressClass extends BaseClass
         if ($order['sendType'] != OrderClass::SEND_TYPE_THIRD) {
             return [];
         }
+        $res = DadaExpressServices::statusOrder($order['orderSn']);
         return [
-            'progressName' => '骑手已接单，取货中',
+            'progressName' => $res['statusMsg']??'',
         ];
     }
 
@@ -44,6 +46,17 @@ class OrderExpressClass extends BaseClass
         return self::add($expData);
     }
 
+    //已取货
+    public static function pickUp($order,$dmName,$dmMobile)
+    {
+        $orderSn = $order['orderSn'];
+        $data = [
+            'dmName'=>$dmName,
+            'dmMobile'=>$dmMobile,
+        ];
+        return self::updateByCondition(['orderSn'=>$orderSn],$data);
+    }
+
     //配送完成
     public static function reach($order)
     {

sql.sql

@@ -1895,3 +1895,8 @@ ALTER TABLE `xhSj` CHANGE `merchantName` `name` VARCHAR(100) NOT NULL DEFAULT ''
 ==linqh
 ALTER TABLE `xhGhsOrderExpress`
 MODIFY COLUMN `distance`  decimal(10,1) NOT NULL DEFAULT 0.0 COMMENT '距离' AFTER `expressName`;
+
+ALTER TABLE `xhGhsOrderExpress`
+ADD COLUMN `dmName`  varchar(200) NOT NULL DEFAULT '' COMMENT '骑手名' AFTER `sendTime`,
+ADD COLUMN `dmMobile`  varchar(30) NOT NULL DEFAULT '' COMMENT '骑手手机号' AFTER `dbName`;
+