From c3dc4d4c1e2a73ab523823a0679983ffaabacde2 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Sat, 22 Mar 2025 16:49:51 +0800
Subject: [PATCH] update

---
 app/api/endpoints/address.py |   6 +++++-
 app/api/endpoints/user.py    |   2 ++
 jobs.sqlite                  | Bin 24576 -> 24576 bytes
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/api/endpoints/address.py b/app/api/endpoints/address.py
index b25bf4f..1e26e9e 100644
--- a/app/api/endpoints/address.py
+++ b/app/api/endpoints/address.py
@@ -99,6 +99,7 @@ async def update_address(
     if update_data.get("is_default"):
         db.query(AddressDB).filter(
             and_(
+                AddressDB.address_type == address.address_type,
                 AddressDB.user_id == current_user.userid,
                 AddressDB.is_default == True
             )
@@ -209,7 +210,10 @@ async def get_address(
         "name": address.AddressDB.name,
         "phone": address.AddressDB.phone,
         "gender": address.AddressDB.gender,
-        "is_default": address.AddressDB.is_default
+        "is_default": address.AddressDB.is_default,
+        "address_type": address.AddressDB.address_type,
+        "longitude": address.AddressDB.longitude,
+        "latitude": address.AddressDB.latitude
     }
     
     return success_response(data=AddressInfo(**address_data)) 
\ No newline at end of file
diff --git a/app/api/endpoints/user.py b/app/api/endpoints/user.py
index 6b54acc..be305d1 100644
--- a/app/api/endpoints/user.py
+++ b/app/api/endpoints/user.py
@@ -20,6 +20,7 @@ from datetime import datetime, timedelta
 from sqlalchemy import text
 from app.models.community import CommunityDB
 from app.models.user_auth import UserAuthDB, UserAuthCreate, UserAuthInfo
+from app.models.address import AddressType
 from app.core.qcloud import qcloud_manager
 from app.models.merchant import MerchantDB
 from app.models.address import AddressDB, AddressInfo
@@ -103,6 +104,7 @@ async def get_user_info(
         CommunityDB,
         AddressDB.community_id == CommunityDB.id
     ).filter(
+        AddressDB.address_type == AddressType.PICKUP,   
         AddressDB.user_id == current_user.userid,
         AddressDB.is_default == True
     ).first()
diff --git a/jobs.sqlite b/jobs.sqlite
index 2c05ffb001a5e4fd0c68c47f3784d5cfde45abac..d248100bb2741b3da9cb63dc518069b024224bb5 100644
GIT binary patch
delta 19
bcmZoTz}Rqrae_4C)rm6Bj8``%EQkjHOydXI

delta 19
bcmZoTz}Rqrae_4C>4`GVjHfpyEQkjHOic&I