From 8eec62410d538f8aa0f10450b0c1e31ca0be5534 Mon Sep 17 00:00:00 2001 From: aaron <> Date: Fri, 7 Mar 2025 15:53:53 +0800 Subject: [PATCH] update --- app/api/endpoints/order_additional_fee.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/api/endpoints/order_additional_fee.py b/app/api/endpoints/order_additional_fee.py index 36e10ac..1e6b544 100644 --- a/app/api/endpoints/order_additional_fee.py +++ b/app/api/endpoints/order_additional_fee.py @@ -89,7 +89,20 @@ async def get_order_additional_fees( if request.order_user_id != current_user.userid and request.deliveryman_id != current_user.userid: return error_response(code=403, message="您无权查看该订单的加价请求") - return success_response(data=OrderAdditionalFeeInfo.model_validate(request)) + result = OrderAdditionalFeeInfo.model_validate(request).model_dump() + + if result.get("deliveryman_id"): + deliveryman = db.query(UserDB).filter( + UserDB.userid == result.get("deliveryman_id") + ).first() + + result.update({ + "deliveryman_name": deliveryman.nickname, + "deliveryman_avatar": deliveryman.avatar, + "deliveryman_phone": deliveryman.phone + }) + + return success_response(data=result) @router.put("/{request_id}/accept", response_model=ResponseModel) async def accept_additional_fee(