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-03-07 19:44:20 +08:00
parent 32feb19954
commit 1789bf966c
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -937,29 +937,30 @@ async def deliveryman_orders(
).all() ).all()
# 获取加价请求 # 获取加价请求
request = db.query(OrderAdditionalFeeDB, requests = db.query(OrderAdditionalFeeDB,
UserDB.nickname.label("deliveryman_name"), UserDB.nickname.label("deliveryman_name"),
UserDB.phone.label("deliveryman_phone"), UserDB.phone.label("deliveryman_phone"),
UserDB.avatar.label("deliveryman_avatar")).join(UserDB, UserDB.avatar.label("deliveryman_avatar")).join(UserDB,
OrderAdditionalFeeDB.deliveryman_id == UserDB.userid).filter( OrderAdditionalFeeDB.deliveryman_id == UserDB.userid).filter(
OrderAdditionalFeeDB.orderid == order.orderid, OrderAdditionalFeeDB.orderid == order.orderid,
OrderAdditionalFeeDB.result == AdditionalFeeResult.ACCEPTED OrderAdditionalFeeDB.result == AdditionalFeeResult.ACCEPTED
).first() ).all()
order_additional_fee = None order_additional_fees = []
if request: if requests:
order_additional_fee = { for fee in requests:
"id": request.OrderAdditionalFeeDB.id, order_additional_fees.append({
"orderid": request.OrderAdditionalFeeDB.orderid, "id": fee.OrderAdditionalFeeDB.id,
"order_user_id": request.OrderAdditionalFeeDB.order_user_id, "orderid": fee.OrderAdditionalFeeDB.orderid,
"deliveryman_id": request.OrderAdditionalFeeDB.deliveryman_id, "order_user_id": fee.OrderAdditionalFeeDB.order_user_id,
"deliveryman_name": request.deliveryman_name, "deliveryman_id": fee.OrderAdditionalFeeDB.deliveryman_id,
"deliveryman_phone": request.deliveryman_phone, "deliveryman_name": fee.deliveryman_name,
"deliveryman_avatar": request.deliveryman_avatar, "deliveryman_phone": fee.deliveryman_phone,
"reason": request.OrderAdditionalFeeDB.reason, "deliveryman_avatar": fee.deliveryman_avatar,
"photo_urls": request.OrderAdditionalFeeDB.photo_urls, "reason": fee.OrderAdditionalFeeDB.reason,
"additional_fee_amount": request.OrderAdditionalFeeDB.additional_fee_amount, "photo_urls": fee.OrderAdditionalFeeDB.photo_urls,
"result": request.OrderAdditionalFeeDB.result, "additional_fee_amount": fee.OrderAdditionalFeeDB.additional_fee_amount,
"result": fee.OrderAdditionalFeeDB.result,
} }
# 计算配送时间 # 计算配送时间
@ -993,7 +994,7 @@ async def deliveryman_orders(
"final_amount": order.final_amount, "final_amount": order.final_amount,
"is_first_order": order.is_first_order, "is_first_order": order.is_first_order,
"packages": package_list, "packages": package_list,
"order_additional_fee": order_additional_fee, "order_additional_fees": order_additional_fees,
"sub_orders": [PointProductOrderInfo.model_validate(sub_order) for sub_order in sub_orders], "sub_orders": [PointProductOrderInfo.model_validate(sub_order) for sub_order in sub_orders],
"address": { "address": {
"name": order.address_customer_name, "name": order.address_customer_name,