diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py index 67394f1..cafe780 100644 --- a/app/api/endpoints/order.py +++ b/app/api/endpoints/order.py @@ -563,7 +563,7 @@ async def cancel_order( @router.get("/deliveryman/list", response_model=ResponseModel) async def get_deliveryman_orders( - status: Optional[OrderStatus] = None, + statuses: Optional[List[OrderStatus]] = None, building_id: Optional[int] = None, skip: int = 0, limit: int = 20, @@ -577,8 +577,8 @@ async def get_deliveryman_orders( ) # 状态筛选 - if status: - query = query.filter(ShippingOrderDB.status == status) + if statuses: + query = query.filter(ShippingOrderDB.status.in_(statuses)) # 楼栋筛选 if building_id: diff --git a/app/models/order.py b/app/models/order.py index 170cac9..e9aaf48 100644 --- a/app/models/order.py +++ b/app/models/order.py @@ -31,7 +31,7 @@ class ShippingOrderDB(Base): # 配送地址信息 address_customer_name = Column(String(50), nullable=False, default='') # 客户名称快照 address_customer_phone = Column(String(11), nullable=False, default='') # 客户电话快照 - address_customer_gender = Column(Enum(Gender), nullable=False, default=Gender.UNKNOWN) # 客户性别快照 + address_customer_gender = Column(Enum(Gender), nullable=False, default=Gender.MALE) # 客户性别快照 address_community_id = Column(Integer, nullable=False) address_community_name = Column(String(50), nullable=False, default='') # 小区名称快照 address_community_building_id = Column(Integer, nullable=False)