订单详情优化

biz-ghs/order/classes/OrderClass.php

@@ -286,7 +286,15 @@ class OrderClass extends BaseClass
             $list[$key]['showResetItem'] = $showResetItem;
 
             //获取配送进展
-            $list[$key]['expressProgress'] = OrderExpressClass::getProgress($showExpress, $val);
+            $expressProgress = '';
+            if($val['sendType'] == 4){
+                $expressInfo = OrderExpressClass::getByCondition(['orderSn'=>$val['orderSn']]);
+                if($expressInfo){
+                    $expressProgress = ['progressName'=> OrderExpressClass::$statusMap[$expressInfo['status']]??''];
+                }
+            }
+             //$list[$key]['expressProgress'] = OrderExpressClass::getProgress($showExpress, $val);
+            $list[$key]['expressProgress'] =$expressProgress;
         }
         return $list;
     }
@@ -347,8 +355,9 @@ class OrderClass extends BaseClass
             util::fail('不是待配送状态');
         }
         $id = $order['id'];
-
-        self::updateById($id, ['status' => self::ORDER_STATUS_SENDING, 'sendType' => self::SEND_TYPE_THIRD,]);
+        $expressId = $expressInfo['expressId'] ?? 1;
+        $expressName = $expressInfo['deliveryName'] ?? '达达';
+        self::updateById($id, ['status' => self::ORDER_STATUS_SENDING, 'sendType' => self::SEND_TYPE_THIRD,'expressId'=>$expressId]);
 
         $express = OrderExpressClass::getByCondition(['orderId' => $id]);
         if (!empty($express)) {
@@ -361,8 +370,7 @@ class OrderClass extends BaseClass
 
         $orderSn = $order['orderSn'];
         $sjId = $order['merchantId'] ?? 0;
-        $expressId = $expressInfo['expressId'] ?? 1;
-        $expressName = $expressInfo['deliveryName'] ?? '达达';
+
 
         /*
         $getInfo = ExpressClass::getExpressInfo($expressId);

biz-ghs/order/classes/OrderExpressClass.php

@@ -15,6 +15,12 @@ class OrderExpressClass extends BaseClass
     const STATUS_CANCEL = 4; //取消
     public static $baseFile = '\bizGhs\order\models\OrderExpress';
 
+    public static $statusMap = [
+        self::STATUS_INIT=>'待接单',
+        self::STATUS_RECEIVE=>'已接单',
+        self::STATUS_COMPLETE=>'已完成',
+        self::STATUS_CANCEL=>'取消',
+    ];
     //获取配送进展
     public static function getProgress($showExpress, $order)
     {