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

---
 app/controller/api/dataview/Logistics.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php
index 1c944b9f..76e8760a 100644
--- a/app/controller/api/dataview/Logistics.php
+++ b/app/controller/api/dataview/Logistics.php
@@ -42,7 +42,7 @@ class Logistics extends BaseController
             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'])
+                    ->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','m.area_id', 'm.street_id', 'm.village_id', 'm.mer_address', 'm.long as mer_long', 'm.lat as mer_lat'])
                     ->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')
@@ -50,6 +50,14 @@ class Logistics extends BaseController
                     ->where('og.street_code', $this->streetCode)
                     ->order('o.order_id', 'desc')
                     ->find();
+        // 拼接商户的详细地址 area_id  street_id  village_id
+        $area = Db::name('geo_area')->where('area_code', $detail['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', $detail['street_id'])->find();
+        $village = Db::name('geo_village')->where('village_id', $detail['village_id'])->find();
+        $merAddress = $province['province_name'] . $city['city_name'] . $area['area_name'] . $street['street_name'].$village['village_name'].$detail['mer_address'];
+        $detail['mer_address'] = $merAddress;
         $detail['status'] = app()->make(Order::class)->getStatusDesc($detail['status']);
         return app('json')->success($detail);
     }