From 3f8bff16f2468423a36409047ec89c707fbd5700 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 4 Jun 2024 16:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/UploadController.php | 2 +-
 app/api/lists/user/UserAddressList.php  | 4 ++--
 app/api/logic/user/AddressLogic.php     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/UploadController.php b/app/api/controller/UploadController.php
index 77c71f68b..7da49ea2a 100644
--- a/app/api/controller/UploadController.php
+++ b/app/api/controller/UploadController.php
@@ -18,7 +18,7 @@
 				$cid = $this->request->post('cid', 0);
 				$result = UploadService::image($cid);
 				return $this->success('上传成功', $result);
-			} catch (Exception $e) {
+			} catch (\Exception $e) {
 				return $this->fail($e->getMessage());
 			}
 		}
diff --git a/app/api/lists/user/UserAddressList.php b/app/api/lists/user/UserAddressList.php
index b6bacad2c..5d4bca28d 100644
--- a/app/api/lists/user/UserAddressList.php
+++ b/app/api/lists/user/UserAddressList.php
@@ -41,9 +41,9 @@ class UserAddressList extends BaseAdminDataLists implements ListsSearchInterface
         $user_id=$this->request->userId;
         if(!$user_id) return [];
         return UserAddress::where($this->searchWhere)->where('uid',$user_id)
-            ->field('address_id,real_name,detail,phone,is_default')
+            ->field('id address_id,real_name,detail,phone,is_default')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['address_id' => 'desc'])
+            ->order(['id' => 'desc'])
             ->select()
             ->toArray();
     }
diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php
index a1efca0c1..068aa6f0d 100644
--- a/app/api/logic/user/AddressLogic.php
+++ b/app/api/logic/user/AddressLogic.php
@@ -68,7 +68,7 @@ class AddressLogic extends BaseLogic
                 'detail' => $params['detail'],
                 'is_default' => $params['is_default'],
             ];
-            UserAddress::where('uid', $params['uid'])->where('address_id', $params['address_id'])->update($data);
+            UserAddress::where('uid', $params['uid'])->where('id', $params['address_id'])->update($data);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -101,6 +101,6 @@ class AddressLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return UserAddress::field('address_id,real_name,phone,detail,is_default')->findOrEmpty($params['address_id'])->toArray();
+        return UserAddress::field('id address_id,real_name,phone,detail,is_default')->where('id',$params['address_id'])->findOrEmpty()->toArray();
     }
 }