From 4f029d5967cb70d641f5acb072012d374f09d08b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 28 Jun 2024 15:10:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserController):=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/user/UserController.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php
index f476f8c34..a853b2220 100644
--- a/app/api/controller/user/UserController.php
+++ b/app/api/controller/user/UserController.php
@@ -13,7 +13,7 @@ use app\common\model\user\UserAddress;
 use app\common\model\user_sign\UserSign;
 use support\Cache;
 use think\Exception;
-
+use think\facade\Db;
 
 /**
  * 用户控制器
@@ -253,7 +253,16 @@ class UserController extends BaseApiController
         if($mobile){
             $user=User::where('mobile',$mobile)->field('id,avatar,real_name,nickname,mobile,user_ship,purchase_funds,label_id')->find();
             if($user){
-                $user['address_info']=UserAddress::where('uid',$user['id'])->where('is_default',1)->find();
+                $address=UserAddress::where('uid',$user['id'])->where('is_default',1)->find();
+                if($address){
+                    $city_name=Db::name('geo_city')->where('city_code',$address['city'])->value('city_name');
+                    $area_name=Db::name('geo_area')->where('area_code',$address['area'])->value('area_name');
+                    $street_name=Db::name('geo_street')->where('street_code',$address['street'])->value('street_name');
+                    $village_name=Db::name('geo_village')->where('village_code',$address['village'])->value('village_name');
+                    $brigade_name=Db::name('geo_brigade')->where('id',$address['brigade'])->value('brigade_name');
+                    $address['address_like']=$city_name.$area_name.$street_name.$village_name.$brigade_name;
+                }
+                $user['address_info']=$address;
             }
             return $this->success('ok',$user?->toArray());
         }