Wesmiler

app/Http/Controllers/Admin/OrderController.php

@@ -68,6 +68,15 @@ class OrderController extends Backend
     }
 
     /**
+     * 订单发货
+     */
+    public function getDelivery()
+    {
+        $id = request()->post('id',0);
+        return $this->service->getDelivery($id);
+    }
+
+    /**
      * 订单结算
      */
     public function settle()

app/Services/Common/OrderService.php

@@ -149,7 +149,6 @@ class OrderService extends BaseService
         $info = $info->toArray();
         $info['create_time'] = $info['create_time'] ? date('Y-m-d H:i:s', strtotime($info['create_time'])) : '';
         $info['update_time'] = $info['update_time'] ? date('Y-m-d H:i:s', strtotime($info['update_time'])) : '';
-        $info['deliveryData'] = $this->getDelivery($info);
         if (isset($info['order_goods'])) {
             foreach ($info['order_goods'] as &$goods) {
                 $goods['thumb'] = $goods['thumb'] ? get_image_url($goods['thumb']) : '';
@@ -227,9 +226,9 @@ class OrderService extends BaseService
      * @param $id
      * @return array|false|mixed
      */
-    public function getDelivery($info)
+    public function getDelivery($id)
     {
-        $id = isset($info['id']) ? $info['id'] : 0;
+        $info = $this->model->where(['id' => $id, 'mark' => 1])->first();
         $deliveryNo = isset($info['delivery_no']) ? $info['delivery_no'] : '';
         $deliveryCode = isset($info['delivery_code']) ? $info['delivery_code'] : '';
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
@@ -267,7 +266,7 @@ class OrderService extends BaseService
             RedisService::set($cacheKey, ['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data], 1200);
         }
 
-        return $data?['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data]:[];
+        return $data?['code'=>1,'data'=>['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data]]:['code'=>1,'获取失败'];
 
     }
 

routes/web.php

@@ -139,6 +139,7 @@ Route::post('/order/delete', [\App\Http\Controllers\Admin\OrderController::class
 Route::post('/order/status', [\App\Http\Controllers\Admin\OrderController::class, 'status']);
 Route::post('/order/completePay', [\App\Http\Controllers\Admin\OrderController::class, 'completePay']);
 Route::post('/order/deliver', [\App\Http\Controllers\Admin\OrderController::class, 'deliver']);
+Route::post('/order/getDelivery', [\App\Http\Controllers\Admin\OrderController::class, 'getDelivery']);
 Route::post('/order/complete', [\App\Http\Controllers\Admin\OrderController::class, 'complete']);
 Route::post('/order/settle', [\App\Http\Controllers\Admin\OrderController::class, 'settle']);
 Route::post('/order/cancel', [\App\Http\Controllers\Admin\OrderController::class, 'cancel']);