From 0efcdfc7d2a18b4deaff3baec0814434167d4ae3 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 5 Dec 2023 16:46:13 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=AC=AC=E4=BA=8C=E9=A1=B5-=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E9=85=8D=E9=80=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php
index cdc173ee..862cdb9a 100755
--- a/app/controller/api/dataview/Logistics.php
+++ b/app/controller/api/dataview/Logistics.php
@@ -159,7 +159,24 @@ class Logistics extends BaseController
     {
         $courierId = $this->request->param('courier_id');
         // 最近一次取货地址 最新一笔的配送中订单的取货地址
-        Db::connect('work_task')->name('vehicle_rent');
+        $latestLogistics = Db::connect('logistics')->name('logistics')->where(['status'=>1, 'courier_id' => $courierId])->order('id', 'desc')->find();
+
+        $latestOrderInfo = Db::name('store_order')->where(['order_id'=>$latestLogistics['order_id']])->find();
+
+        $merchant = Db::name('merchant')->where(['mer_id'=>$latestOrderInfo['mer_id']])->find();
+
+        // 拼接商户的详细地址 area_id  street_id  village_id
+        $area = Db::name('geo_area')->where('area_code', $merchant['area_id'])->find();
+        $city = Db::name('geo_city')->where('city_code', $area['city_code'])->find();
+        $province = Db::name('geo_province')->where('province_code', $city['province_code'])->find();
+        $street = Db::name('geo_street')->where('street_code', $merchant['street_id'])->find();
+        $village = Db::name('geo_village')->where('village_id', $merchant['village_id'])->find();
+        $merAddress = $province['province_name'] . $city['city_name'] . $area['area_name'] . $street['street_name'].$village['village_name'].$merchant['mer_address'];
+
+        $latestOrder['mer_address'] = $merAddress;
+
         // 最新的10笔订单
+        $latestTenOrder = Db::connect('logistics')->name('logistics')->field('receiver_address')->where(['status'=>1, 'courier_id' => $courierId])->order('id', 'desc')->limit(10)->select()->toArray();
+        return app('json')->success(compact('latestOrder', 'latestTenOrder'));
     }
 }
\ No newline at end of file
diff --git a/route/api.php b/route/api.php
index 9d8cc573..bba3f4c2 100644
--- a/route/api.php
+++ b/route/api.php
@@ -727,6 +727,7 @@ Route::group('api/', function () {
         Route::get('vehicle_list', 'Logistics/vehicleList');
         Route::get('latest_logistics', 'Logistics/latestLogistics');
         Route::get('logistics_count', 'Logistics/logisticsCount');
+        Route::get('logistics_map_count', 'Logistics/logisticsMapCount');
 
 
     })->prefix('api.dataview.');