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