diff --git a/app/api/endpoints/address.py b/app/api/endpoints/address.py index 59e2e3f..051b6ad 100644 --- a/app/api/endpoints/address.py +++ b/app/api/endpoints/address.py @@ -55,11 +55,7 @@ async def get_addresses( ): """获取用户的所有配送地址""" addresses = db.query( - AddressDB, - CommunityDB.name.label('community_name') - ).join( - CommunityDB, - AddressDB.community_id == CommunityDB.id + AddressDB ).filter( AddressDB.user_id == current_user.userid ) @@ -68,11 +64,11 @@ async def get_addresses( addresses = addresses.filter(AddressDB.community_id == community_id) addresses = addresses.all() + addresses_list = [] + for a in addresses: + addresses_list.append(AddressInfo.model_validate(a)) - return success_response(data=[{ - **AddressInfo.model_validate(a[0]).model_dump(), - "community_name": a[1] - } for a in addresses]) + return success_response(data=addresses_list) @router.put("/{address_id}", response_model=ResponseModel) async def update_address( diff --git a/app/models/address.py b/app/models/address.py index 4f3aaec..ef33671 100644 --- a/app/models/address.py +++ b/app/models/address.py @@ -45,10 +45,9 @@ class AddressUpdate(BaseModel): class AddressInfo(BaseModel): id: int community_id: int - community_name:Optional[str] community_name: Optional[str] = None community_building_id: Optional[int] - community_building_name: Optional[str] + community_building_name: Optional[str] = None address_detail: str name: str phone: str