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-25 00:10:16 +08:00
parent 74df188a7d
commit ab79cb05a7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,10 @@ 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(
@ -365,13 +368,14 @@ async def get_order_detail(
).count() ).count()
# 计算配送员分账金额 # 计算配送员分账金额
deliveryman_share = round(order.original_amount * (deliveryman_user.delivery_commission_rate / 100.0), 1) deliveryman_share = round(order.original_amount * (current_user.delivery_commission_rate / 100.0), 1)
else: else:
delivery_count = 0 delivery_count = 0
deliveryman_user_name = None deliveryman_user_name = None
deliveryman_user_avatar = None deliveryman_user_avatar = None
deliveryman_user_phone = None deliveryman_user_phone = None
# 查询包裹信息 # 查询包裹信息
packages = db.query( packages = db.query(
ShippingOrderPackageDB ShippingOrderPackageDB