处理地址问题
This commit is contained in:
parent
f2fe470bcc
commit
3a746e0bf5
@ -55,11 +55,7 @@ async def get_addresses(
|
|||||||
):
|
):
|
||||||
"""获取用户的所有配送地址"""
|
"""获取用户的所有配送地址"""
|
||||||
addresses = db.query(
|
addresses = db.query(
|
||||||
AddressDB,
|
AddressDB
|
||||||
CommunityDB.name.label('community_name')
|
|
||||||
).join(
|
|
||||||
CommunityDB,
|
|
||||||
AddressDB.community_id == CommunityDB.id
|
|
||||||
).filter(
|
).filter(
|
||||||
AddressDB.user_id == current_user.userid
|
AddressDB.user_id == current_user.userid
|
||||||
)
|
)
|
||||||
@ -68,11 +64,11 @@ async def get_addresses(
|
|||||||
addresses = addresses.filter(AddressDB.community_id == community_id)
|
addresses = addresses.filter(AddressDB.community_id == community_id)
|
||||||
|
|
||||||
addresses = addresses.all()
|
addresses = addresses.all()
|
||||||
|
addresses_list = []
|
||||||
|
for a in addresses:
|
||||||
|
addresses_list.append(AddressInfo.model_validate(a))
|
||||||
|
|
||||||
return success_response(data=[{
|
return success_response(data=addresses_list)
|
||||||
**AddressInfo.model_validate(a[0]).model_dump(),
|
|
||||||
"community_name": a[1]
|
|
||||||
} for a in addresses])
|
|
||||||
|
|
||||||
@router.put("/{address_id}", response_model=ResponseModel)
|
@router.put("/{address_id}", response_model=ResponseModel)
|
||||||
async def update_address(
|
async def update_address(
|
||||||
|
|||||||
@ -45,10 +45,9 @@ class AddressUpdate(BaseModel):
|
|||||||
class AddressInfo(BaseModel):
|
class AddressInfo(BaseModel):
|
||||||
id: int
|
id: int
|
||||||
community_id: int
|
community_id: int
|
||||||
community_name:Optional[str]
|
|
||||||
community_name: Optional[str] = None
|
community_name: Optional[str] = None
|
||||||
community_building_id: Optional[int]
|
community_building_id: Optional[int]
|
||||||
community_building_name: Optional[str]
|
community_building_name: Optional[str] = None
|
||||||
address_detail: str
|
address_detail: str
|
||||||
name: str
|
name: str
|
||||||
phone: str
|
phone: str
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user