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

update

Browse Source
This commit is contained in:
aaron 2025-02-24 21:00:36 +08:00
parent aaf5fcdeea
commit 3914831cc9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ async def create_order(
}) })
# 超过晚上8点，则使用明天送达的文案 # 超过晚上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 success_text = settings.ORDER_SUCCESS_TOMORROW_TEXT
else: else:
success_text = settings.ORDER_SUCCESS_TODAY_TEXT success_text = settings.ORDER_SUCCESS_TODAY_TEXT
@ -753,6 +753,10 @@ async def get_deliveryman_orders(
if OrderStatus.CREATED not in statuses: if OrderStatus.CREATED not in statuses:
query = query.filter(ShippingOrderDB.deliveryman_user_id == deliveryman.userid) 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: if building_id:
query = query.filter(ShippingOrderDB.address_community_building_id == building_id) query = query.filter(ShippingOrderDB.address_community_building_id == building_id)

1
app/core/config.py
View File

@ -18,6 +18,7 @@ class Settings(BaseSettings):
ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值 ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值
#订单创建成功文案 #订单创建成功文案
ORDER_SPLIT_TIME_HOUR: int = 20 # 订单分割时间
ORDER_SUCCESS_TODAY_TEXT: str = "订单预计今晚前送达，请注意查收" ORDER_SUCCESS_TODAY_TEXT: str = "订单预计今晚前送达，请注意查收"
ORDER_SUCCESS_TOMORROW_TEXT: str = "订单预计明晚前送达，请注意查收" ORDER_SUCCESS_TOMORROW_TEXT: str = "订单预计明晚前送达，请注意查收"