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-25 20:15:28 +08:00
parent c842225fcc
commit 841466483d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,8 +464,8 @@ async def get_order_status_count(
ShippingOrderDB.address_community_id == community_id, ShippingOrderDB.address_community_id == community_id,
ShippingOrderDB.status == OrderStatus.CREATED ShippingOrderDB.status == OrderStatus.CREATED
).count() ).count()
others_status_count = db.query( others_status_count = db.query(
ShippingOrderDB.status, ShippingOrderDB.status,
func.count(ShippingOrderDB.orderid) func.count(ShippingOrderDB.orderid)
@ -779,8 +779,9 @@ async def get_deliveryman_orders(
query = query.filter(ShippingOrderDB.deliveryman_user_id == deliveryman.userid) query = query.filter(ShippingOrderDB.deliveryman_user_id == deliveryman.userid)
# 如果订单状态是待接单，则只显示小于等于 20 点的订单 # 如果订单状态是待接单，则只显示小于等于 20 点的订单
if OrderStatus.CREATED in statuses: if settings.ORDER_SPLIT_ENABLE:
query = query.filter(ShippingOrderDB.create_time <= datetime.now().replace(hour=settings.ORDER_SPLIT_TIME_HOUR, minute=0, second=0)) 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:

1
app/core/config.py
View File

@ -21,6 +21,7 @@ class Settings(BaseSettings):
ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值 ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值
#订单创建成功文案 #订单创建成功文案
ORDER_SPLIT_ENABLE: bool = False
ORDER_SPLIT_TIME_HOUR: int = 20 # 订单分割时间 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 = "订单预计明晚前送达，请注意查收"