From 1789bf966cb4e2e19dac77abdaa1b512db64834e Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 7 Mar 2025 19:44:20 +0800
Subject: [PATCH] update

---
 app/api/endpoints/order.py | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 324df60..88c6fbe 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -937,29 +937,30 @@ async def deliveryman_orders(
         ).all()
 
         # 获取加价请求
-        request = db.query(OrderAdditionalFeeDB,
+        requests = db.query(OrderAdditionalFeeDB,
                            UserDB.nickname.label("deliveryman_name"),
                            UserDB.phone.label("deliveryman_phone"),
                            UserDB.avatar.label("deliveryman_avatar")).join(UserDB, 
                            OrderAdditionalFeeDB.deliveryman_id == UserDB.userid).filter(
             OrderAdditionalFeeDB.orderid == order.orderid,
             OrderAdditionalFeeDB.result == AdditionalFeeResult.ACCEPTED
-        ).first()
+        ).all()
 
-        order_additional_fee = None
-        if request:
-            order_additional_fee = {
-                "id": request.OrderAdditionalFeeDB.id,
-                "orderid": request.OrderAdditionalFeeDB.orderid,
-                "order_user_id": request.OrderAdditionalFeeDB.order_user_id,
-                "deliveryman_id": request.OrderAdditionalFeeDB.deliveryman_id,
-                "deliveryman_name": request.deliveryman_name,
-                "deliveryman_phone": request.deliveryman_phone,
-                "deliveryman_avatar": request.deliveryman_avatar,
-                "reason": request.OrderAdditionalFeeDB.reason,
-                "photo_urls": request.OrderAdditionalFeeDB.photo_urls,
-                "additional_fee_amount": request.OrderAdditionalFeeDB.additional_fee_amount,
-                "result": request.OrderAdditionalFeeDB.result,
+        order_additional_fees = []
+        if requests:
+            for fee in requests:
+                order_additional_fees.append({
+                    "id": fee.OrderAdditionalFeeDB.id,
+                    "orderid": fee.OrderAdditionalFeeDB.orderid,
+                    "order_user_id": fee.OrderAdditionalFeeDB.order_user_id,
+                    "deliveryman_id": fee.OrderAdditionalFeeDB.deliveryman_id,
+                    "deliveryman_name": fee.deliveryman_name,
+                    "deliveryman_phone": fee.deliveryman_phone,
+                    "deliveryman_avatar": fee.deliveryman_avatar,
+                    "reason": fee.OrderAdditionalFeeDB.reason,
+                    "photo_urls": fee.OrderAdditionalFeeDB.photo_urls,
+                    "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,
             "is_first_order": order.is_first_order,
             "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],
             "address": {
                 "name": order.address_customer_name,