From 21c37a5345ac59d6ace5e98ddcb0d62a70cfba58 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 17:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/user/UserLists.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php
index 2ce801a64..7976c871f 100644
--- a/app/admin/lists/user/UserLists.php
+++ b/app/admin/lists/user/UserLists.php
@@ -11,6 +11,7 @@ use app\common\lists\ListsExcelInterface;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\vip_flow\VipFlow;
+use support\Db;
 
 class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 {
@@ -76,6 +77,30 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
             $item['return_money'] = VipFlow::
             where(['user_id'=>$item['id'],'status'=>0])
                 ->sum('number')??0;
+            $address = UserAddress::where('uid',$item['id'])->find();
+            $item['city'] = '';
+            $item['area'] = '';
+            $item['street'] = '';
+            $item['village'] = '';
+            $item['brigade'] = '';
+            if($address){
+                if($address['city']){
+                    $item['city'] = \think\facade\Db::name('geo_city')->where('city_code',$address['city'])->value('city_name')??'';
+                }
+                if($address['area']){
+                    $item['area'] = \think\facade\Db::name('geo_area')->where('area_code',$address['area'])->value('area_name')??'';
+                }
+                if($address['street']){
+                    $item['street'] = \think\facade\Db::name('geo_street')->where('street_code',$address['street'])->value('street_name')??'';
+                }
+                if($address['village']){
+                    $item['village'] = \think\facade\Db::name('geo_village')->where('village_code',$address['village'])->value('village_name')??'';
+                }
+                if($address['brigade']){
+                    $item['brigade'] = $address['brigade'] ? $address['brigade'].'队':'';
+                }
+            }
+            $item['format_address'] = $item['city'].'/'.$item['area'].'/'.$item['street'].'/'.$item['village'].'/'. $item['brigade'];
         }
 
         return $lists;