update
This commit is contained in:
parent
afa3d267cf
commit
f504123bae
@ -121,7 +121,7 @@ async def pre_order(
|
||||
ShippingOrderDB.userid == current_user.userid,
|
||||
ShippingOrderDB.status.not_in([OrderStatus.CANCELLED, OrderStatus.COMPLETED])
|
||||
).first()
|
||||
|
||||
|
||||
if unpay_order:
|
||||
return error_response(code=400, message="存在未完成的订单", data={
|
||||
"orderid": unpay_order.orderid
|
||||
@ -273,9 +273,7 @@ async def create_order(
|
||||
@router.get("/{orderid}", response_model=ResponseModel)
|
||||
async def get_order_detail(
|
||||
orderid: str,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: UserDB = Depends(get_current_user)
|
||||
):
|
||||
db: Session = Depends(get_db)):
|
||||
"""获取订单详情"""
|
||||
# 使用 join 查询获取订单和相关地址信息
|
||||
order = db.query(
|
||||
@ -287,10 +285,6 @@ async def get_order_detail(
|
||||
if not order:
|
||||
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(
|
||||
ShippingOrderPackageDB,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user