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

增加配送员信息

Browse Source
This commit is contained in:
aaron 2025-02-13 16:07:01 +08:00
parent 4c67896044
commit 38b88bfb19
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,7 +273,25 @@ async def get_order_detail(
).filter(
ShippingOrderPackageDB.orderid == orderid
).all()
# 如果有配送员 id，则获取配送员信息
if order.ShippingOrderDB.deliveryman_user_id:
deliveryman_user = db.query(UserDB).filter(
UserDB.userid == order.ShippingOrderDB.deliveryman_user_id
).first()
deliveryman_user_name = deliveryman_user.nickname
deliveryman_user_avatar = deliveryman_user.optimized_avatar
deliveryman_user_phone = deliveryman_user.phone
delivery_count = db.query(ShippingOrderDB).filter(
ShippingOrderDB.deliveryman_user_id == order.ShippingOrderDB.deliveryman_user_id,
ShippingOrderDB.status == OrderStatus.COMPLETED
).count()
else:
deliveryman_user_name = None
delivery_count = 0
deliveryman_user_avatar = None
deliveryman_user_phone = None
# 构建响应数据
order_data = {
"orderid": order.ShippingOrderDB.orderid,
@ -289,6 +307,10 @@ async def get_order_detail(
"create_time": order.ShippingOrderDB.create_time,
"delivery_method": order.ShippingOrderDB.delivery_method,
"deliveryman_user_id": order.ShippingOrderDB.deliveryman_user_id,
"deliveryman_nickname": deliveryman_user_name,
"deliveryman_avatar": deliveryman_user_avatar,
"deliveryman_phone": deliveryman_user_phone,
"delivery_count": delivery_count,
# 地址相关信息
"address_name": order.address_name,
"address_phone": order.address_phone,