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-19 15:46:40 +08:00
parent afa3d267cf
commit f504123bae
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ async def pre_order(
ShippingOrderDB.userid == current_user.userid, ShippingOrderDB.userid == current_user.userid,
ShippingOrderDB.status.not_in([OrderStatus.CANCELLED, OrderStatus.COMPLETED]) ShippingOrderDB.status.not_in([OrderStatus.CANCELLED, OrderStatus.COMPLETED])
).first() ).first()
if unpay_order: if unpay_order:
return error_response(code=400, message="存在未完成的订单", data={ return error_response(code=400, message="存在未完成的订单", data={
"orderid": unpay_order.orderid "orderid": unpay_order.orderid
@ -273,9 +273,7 @@ async def create_order(
@router.get("/{orderid}", response_model=ResponseModel) @router.get("/{orderid}", response_model=ResponseModel)
async def get_order_detail( async def get_order_detail(
orderid: str, orderid: str,
db: Session = Depends(get_db), db: Session = Depends(get_db)):
current_user: UserDB = Depends(get_current_user)
):
"""获取订单详情""" """获取订单详情"""
# 使用 join 查询获取订单和相关地址信息 # 使用 join 查询获取订单和相关地址信息
order = db.query( order = db.query(
@ -287,10 +285,6 @@ async def get_order_detail(
if not order: if not order:
return error_response(code=404, message="订单不存在") return error_response(code=404, message="订单不存在")
# 检查权限
if order.userid != current_user.userid and UserRole.ADMIN not in current_user.roles:
return error_response(code=403, message="无权查看此订单")
# 查询包裹信息，包含驿站名称 # 查询包裹信息，包含驿站名称
packages = db.query( packages = db.query(
ShippingOrderPackageDB, ShippingOrderPackageDB,