From 32feb199542810cb47227dc454844d004f2264c5 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 7 Mar 2025 19:32:09 +0800
Subject: [PATCH] uopdate

---
 app/api/endpoints/order.py                | 8 +++++---
 app/api/endpoints/order_additional_fee.py | 3 ++-
 app/models/order_additional_fee.py        | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 119801d..324df60 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -15,7 +15,7 @@ from app.models.order import (
     OrderComplete,
     OrderPriceResult
 )
-from app.models.order_additional_fee import OrderAdditionalFeeDB, OrderAdditionalFeeInfo
+from app.models.order_additional_fee import OrderAdditionalFeeDB, OrderAdditionalFeeInfo, AdditionalFeeResult
 from app.models.database import get_db
 from app.api.deps import get_current_user, get_deliveryman_user, get_admin_user
 from app.models.user import UserDB,UserRole
@@ -449,7 +449,8 @@ async def get_order_detail(
                         UserDB.phone.label("deliveryman_phone"),
                         UserDB.avatar.label("deliveryman_avatar")).join(UserDB, 
                         OrderAdditionalFeeDB.deliveryman_id == UserDB.userid).filter(
-        OrderAdditionalFeeDB.orderid == order.orderid
+        OrderAdditionalFeeDB.orderid == order.orderid,
+        OrderAdditionalFeeDB.result == AdditionalFeeResult.PENDING
     ).first()
 
     order_additional_fee = None
@@ -941,7 +942,8 @@ async def deliveryman_orders(
                            UserDB.phone.label("deliveryman_phone"),
                            UserDB.avatar.label("deliveryman_avatar")).join(UserDB, 
                            OrderAdditionalFeeDB.deliveryman_id == UserDB.userid).filter(
-            OrderAdditionalFeeDB.orderid == order.orderid
+            OrderAdditionalFeeDB.orderid == order.orderid,
+            OrderAdditionalFeeDB.result == AdditionalFeeResult.ACCEPTED
         ).first()
 
         order_additional_fee = None
diff --git a/app/api/endpoints/order_additional_fee.py b/app/api/endpoints/order_additional_fee.py
index 1e6b544..2dd9724 100644
--- a/app/api/endpoints/order_additional_fee.py
+++ b/app/api/endpoints/order_additional_fee.py
@@ -79,7 +79,8 @@ async def get_order_additional_fees(
     """获取订单的加价请求列表"""
     # 检查订单是否存在
     request = db.query(OrderAdditionalFeeDB).filter(
-        OrderAdditionalFeeDB.orderid == orderid
+        OrderAdditionalFeeDB.orderid == orderid,
+        OrderAdditionalFeeDB.result == AdditionalFeeResult.PENDING
     ).first()
     
     if not request:
diff --git a/app/models/order_additional_fee.py b/app/models/order_additional_fee.py
index ba22eea..f4db832 100644
--- a/app/models/order_additional_fee.py
+++ b/app/models/order_additional_fee.py
@@ -43,9 +43,9 @@ class OrderAdditionalFeeInfo(BaseModel):
     orderid: str
     order_user_id: int
     deliveryman_id: int
-    deliveryman_name: str
-    deliveryman_phone: str
-    deliveryman_avatar: str
+    deliveryman_name: Optional[str] = None
+    deliveryman_phone: Optional[str] = None
+    deliveryman_avatar: Optional[str] = None
     reason: str
     photo_urls: Optional[List[str]]
     additional_fee_amount: float