From f0c2c55f90194d2b0e25c29bc9d0e999c11b4142 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Mon, 4 Dec 2023 10:40:20 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=B8=89=E8=BD=AE=E8=BD=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3,=E9=95=87=E7=BA=A7=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=A9=E6=B5=81=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Logistics.php | 20 ++++++++++++++++++++
 app/controller/api/dataview/Order.php     |  2 +-
 route/api.php                             |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php
index 44ef1327..1c944b9f 100644
--- a/app/controller/api/dataview/Logistics.php
+++ b/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);
+    }
 }
\ No newline at end of file
diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index 6cf6dbfd..73b4d416 100644
--- a/app/controller/api/dataview/Order.php
+++ b/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 = [
diff --git a/route/api.php b/route/api.php
index d13e31da..5ece750a 100644
--- a/route/api.php
+++ b/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)