add 三轮车列表接口,镇级最新物流配送详情接口

app/controller/api/dataview/Logistics.php

@@ -6,6 +6,7 @@ use app\common\repositories\BaseRepository;
 use crmeb\basic\BaseController;
 use think\App;
 use think\exception\ValidateException;
+use think\facade\Db;
 
 class Logistics extends BaseController
 {
@@ -33,4 +34,23 @@ class Logistics extends BaseController
         $count = count($list);
         return app('json')->success(compact('count', 'list'));
     }
+
+    // 镇级最新物流配送详情
+    public function latestLogistics()
+    {
+        if ($this->streetCode == '') {
+            return app('json')->fail('未获取到位置信息');
+        }
+        $detail = Db::name('store_order')->alias('o')
+                    ->field(['o.order_sn', 'o.real_name', 'o.user_phone', 'o.user_address', 'o.user_address_code', 'p.store_name', 'm.mer_name', 'o.create_time', 'o.status'])
+                    ->leftJoin('product_order_log og', 'o.order_id = og.order_id')
+                    ->leftJoin('merchant m', 'o.mer_id = m.mer_id')
+                    ->leftJoin('store_order_product op', 'o.order_id = op.order_id')
+                    ->leftJoin('product_library p', 'op.product_id = p.id')
+                    ->where('og.street_code', $this->streetCode)
+                    ->order('o.order_id', 'desc')
+                    ->find();
+        $detail['status'] = app()->make(Order::class)->getStatusDesc($detail['status']);
+        return app('json')->success($detail);
+    }
 }

app/controller/api/dataview/Order.php

@@ -152,7 +152,7 @@ class Order extends BaseController
         return app('json')->success(compact('orderCount', 'townOrderList'));
     }
 
-    private function getStatusDesc($status)
+    public function getStatusDesc($status)
     {
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成； 9: 拼团中 10:  待付尾款 11:尾款超时未付 -1：已退款）
         $desc = [

route/api.php

@@ -721,6 +721,7 @@ Route::group('api/', function () {
         Route::get('order_ranking', 'Order/orderRanking');
         Route::get('delivered_product_ranking', 'Order/deliveredProductRanking');
         Route::get('vehicle_list', 'Logistics/vehicleList');
+        Route::get('latest_logistics', 'Logistics/latestLogistics');
 
     })->prefix('api.dataview.');
 })->middleware(AllowOriginMiddleware::class)