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

uopdate

Browse Source
This commit is contained in:
aaron 2025-03-07 19:32:09 +08:00
parent 1829189e59
commit 32feb19954
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ from app.models.order import (
OrderComplete, OrderComplete,
OrderPriceResult 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.models.database import get_db
from app.api.deps import get_current_user, get_deliveryman_user, get_admin_user from app.api.deps import get_current_user, get_deliveryman_user, get_admin_user
from app.models.user import UserDB,UserRole from app.models.user import UserDB,UserRole
@ -449,7 +449,8 @@ async def get_order_detail(
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.PENDING
).first() ).first()
order_additional_fee = None order_additional_fee = None
@ -941,7 +942,8 @@ async def deliveryman_orders(
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
).first() ).first()
order_additional_fee = None order_additional_fee = None

3
app/api/endpoints/order_additional_fee.py
View File

@ -79,7 +79,8 @@ async def get_order_additional_fees(
"""获取订单的加价请求列表""" """获取订单的加价请求列表"""
# 检查订单是否存在 # 检查订单是否存在
request = db.query(OrderAdditionalFeeDB).filter( request = db.query(OrderAdditionalFeeDB).filter(
OrderAdditionalFeeDB.orderid == orderid OrderAdditionalFeeDB.orderid == orderid,
OrderAdditionalFeeDB.result == AdditionalFeeResult.PENDING
).first() ).first()
if not request: if not request:

6
app/models/order_additional_fee.py
View File

@ -43,9 +43,9 @@ class OrderAdditionalFeeInfo(BaseModel):
orderid: str orderid: str
order_user_id: int order_user_id: int
deliveryman_id: int deliveryman_id: int
deliveryman_name: str deliveryman_name: Optional[str] = None
deliveryman_phone: str deliveryman_phone: Optional[str] = None
deliveryman_avatar: str deliveryman_avatar: Optional[str] = None
reason: str reason: str
photo_urls: Optional[List[str]] photo_urls: Optional[List[str]]
additional_fee_amount: float additional_fee_amount: float