From 1165b07a8cf9b9c4b790a3fac0772a61028b0310 Mon Sep 17 00:00:00 2001 From: aaron <> Date: Mon, 17 Feb 2025 18:31:55 +0800 Subject: [PATCH] update. --- app/api/endpoints/order.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py index f9b0b3f..0b3460b 100644 --- a/app/api/endpoints/order.py +++ b/app/api/endpoints/order.py @@ -387,6 +387,7 @@ async def get_community_building_order_count( # 查询每个楼栋的订单数量 building_order_count = db.query( + ShippingOrderDB.address_community_building_id, ShippingOrderDB.address_community_building_name, func.count(ShippingOrderDB.orderid) ).filter( @@ -405,11 +406,13 @@ async def get_community_building_order_count( for building in community_buildings: if building.building_name not in building_order_count_dict: result.append({ + "building_id": building.id, "building_name": building.building_name, "order_count": 0 }) else: result.append({ + "building_id": building.id, "building_name": building.building_name, "order_count": building_order_count_dict[building.building_name] }) @@ -559,7 +562,7 @@ async def cancel_order( @router.get("/deliveryman/list", response_model=ResponseModel) async def get_deliveryman_orders( status: Optional[OrderStatus] = None, - building_name: Optional[str] = None, + building_id: Optional[int] = None, skip: int = 0, limit: int = 20, db: Session = Depends(get_db), @@ -576,8 +579,8 @@ async def get_deliveryman_orders( query = query.filter(ShippingOrderDB.status == status) # 楼栋筛选 - if building_name: - query = query.filter(ShippingOrderDB.address_community_building_name == building_name) + if building_id: + query = query.filter(ShippingOrderDB.address_community_building_id == building_id) # 获取总数 total = query.count()