diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py index 2cba28c..eb454a4 100644 --- a/app/api/endpoints/order.py +++ b/app/api/endpoints/order.py @@ -464,8 +464,8 @@ async def get_order_status_count( ShippingOrderDB.address_community_id == community_id, ShippingOrderDB.status == OrderStatus.CREATED ).count() - - + + others_status_count = db.query( ShippingOrderDB.status, func.count(ShippingOrderDB.orderid) @@ -779,8 +779,9 @@ async def get_deliveryman_orders( query = query.filter(ShippingOrderDB.deliveryman_user_id == deliveryman.userid) # 如果订单状态是待接单,则只显示小于等于 20 点的订单 - if OrderStatus.CREATED in statuses: - query = query.filter(ShippingOrderDB.create_time <= datetime.now().replace(hour=settings.ORDER_SPLIT_TIME_HOUR, minute=0, second=0)) + if settings.ORDER_SPLIT_ENABLE: + if OrderStatus.CREATED in statuses: + query = query.filter(ShippingOrderDB.create_time <= datetime.now().replace(hour=settings.ORDER_SPLIT_TIME_HOUR, minute=0, second=0)) # 楼栋筛选 if building_id: diff --git a/app/core/config.py b/app/core/config.py index d6a6221..1d04dd5 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -21,6 +21,7 @@ class Settings(BaseSettings): ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值 #订单创建成功文案 + ORDER_SPLIT_ENABLE: bool = False ORDER_SPLIT_TIME_HOUR: int = 20 # 订单分割时间 ORDER_SUCCESS_TODAY_TEXT: str = "订单预计今晚前送达,请注意查收" ORDER_SUCCESS_TOMORROW_TEXT: str = "订单预计明晚前送达,请注意查收"