From 32e53ddda44a81179270218e8e93d8ddcd0e2bd8 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 7 Aug 2023 11:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E9=98=9F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/store/shipping/City.php          | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/controller/merchant/store/shipping/City.php b/app/controller/merchant/store/shipping/City.php
index 3158b0ea..2d252422 100644
--- a/app/controller/merchant/store/shipping/City.php
+++ b/app/controller/merchant/store/shipping/City.php
@@ -61,6 +61,7 @@ class City extends BaseController
             if (!empty($v['village_id'])) {
                 $temp = [
                     'type' => 'village',
+                    'village_id' => $v['village_id'],
                     'level' => 5,
                     'name' => $v['village_name'] ?? '',
                     'code' => $v['village_code'] ?? ''
@@ -70,6 +71,7 @@ class City extends BaseController
             if (!empty($v['street_id'])) {
                 $temp = [
                     'type' => 'street',
+                    'street_id' => $v['street_id'],
                     'level' => 4,
                     'name' => $v['street_name'] ?? '',
                     'code' => $v['street_code'] ?? ''
@@ -79,6 +81,7 @@ class City extends BaseController
             if (!empty($v['area_id'])) {
                 $temp = [
                     'type' => 'area',
+                    'area_id' => $v['area_id'],
                     'level' => 3,
                     'name' => $v['area_name'] ?? '',
                     'code' => $v['area_code'] ?? ''
@@ -88,6 +91,7 @@ class City extends BaseController
             if (!empty($v['city_id'])) {
                 $temp = [
                     'type' => 'city',
+                    'city_id' => $v['city_id'],
                     'level' => 2,
                     'name' => $v['city_name'] ?? '',
                     'code' => $v['city_code'] ?? ''
@@ -97,6 +101,7 @@ class City extends BaseController
             if (!empty($v['province_id'])) {
                 $temp = [
                     'type' => 'province',
+                    'province_id' => $v['province_id'],
                     'level' => 1,
                     'name' => $v['province_name'] ?? '',
                     'code' => $v['province_code'] ?? ''
@@ -109,7 +114,19 @@ class City extends BaseController
 
     public function brigade()
     {
-        return app('json')->success(app()->make(CityAreaRepository::class)->getBrigade([]));
+        $list = app()->make(CityAreaRepository::class)->getBrigade([]);
+        $geoList = [];
+        foreach ($list as $v) {
+            $temp = [
+                'type' => 'brigade',
+                'brigade_id' => $v['id'],
+                'level' => 6,
+                'name' => $v['brigade_name'] ?? '',
+                'code' => $v['brigade_name'] ?? ''
+            ];
+            $geoList[] = $temp;
+        }
+        return app('json')->success($geoList);
     }