deliveryman/deliveryman-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
aaron 2025-02-15 21:54:36 +08:00
parent ca1b990b0b
commit 2e0ba7b904
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/endpoints/order.py
View File

@ -736,7 +736,7 @@ async def pickup_order(
return error_response(code=500, message=f"操作失败: {str(e)}") return error_response(code=500, message=f"操作失败: {str(e)}")
@router.get("/admin/list", response_model=ResponseModel) @router.get("/admin/list", response_model=ResponseModel)
async def get_orders( async def get_admin_orders(
status: Optional[OrderStatus] = None, status: Optional[OrderStatus] = None,
user_id: Optional[int] = None, user_id: Optional[int] = None,
order_id: Optional[str] = None, order_id: Optional[str] = None,
@ -756,9 +756,7 @@ async def get_orders(
""" """
try: try:
# 构建基础查询 # 构建基础查询
query = db.query( query = db.query(ShippingOrderDB)
ShippingOrderDB
)
# 添加用户ID过滤 # 添加用户ID过滤
if user_id: if user_id:
@ -781,7 +779,7 @@ async def get_orders(
).offset(skip).limit(limit).all() ).offset(skip).limit(limit).all()
orders = [] orders = []
for order, address, building, community in results: for order in results:
# 查询订单包裹信息 # 查询订单包裹信息
packages = db.query( packages = db.query(
ShippingOrderPackageDB, ShippingOrderPackageDB,
@ -828,4 +826,5 @@ async def get_orders(
}) })
except Exception as e: except Exception as e:
logging.exception(f"获取订单列表失败: {str(e)}")
return error_response(code=500, message=f"获取订单列表失败: {str(e)}") return error_response(code=500, message=f"获取订单列表失败: {str(e)}")