diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py index 03f808b..de4f2bc 100644 --- a/app/api/endpoints/order.py +++ b/app/api/endpoints/order.py @@ -311,7 +311,7 @@ async def create_order( }) # 超过晚上8点,则使用明天送达的文案 - if datetime.now().time() > time(20, 0, 0): + if datetime.now() > datetime.now().replace(hour=settings.ORDER_SPLIT_TIME_HOUR, minute=0, second=0): success_text = settings.ORDER_SUCCESS_TOMORROW_TEXT else: success_text = settings.ORDER_SUCCESS_TODAY_TEXT @@ -752,6 +752,10 @@ async def get_deliveryman_orders( # 如果订单状态不是待接单,则需要过滤快递员 if OrderStatus.CREATED not in statuses: 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 building_id: diff --git a/app/core/config.py b/app/core/config.py index 92f4edb..7e3cabf 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -18,6 +18,7 @@ class Settings(BaseSettings): ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值 #订单创建成功文案 + ORDER_SPLIT_TIME_HOUR: int = 20 # 订单分割时间 ORDER_SUCCESS_TODAY_TEXT: str = "订单预计今晚前送达,请注意查收" ORDER_SUCCESS_TOMORROW_TEXT: str = "订单预计明晚前送达,请注意查收"