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

upddate

Browse Source
This commit is contained in:
aaron 2025-03-09 00:22:12 +08:00
parent 7632c54b46
commit b6507f7a3d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,10 +572,10 @@ async def deliveryman_get_order_status_count(
ShippingOrderDB.deliveryman_user_id == current_user.userid ShippingOrderDB.deliveryman_user_id == current_user.userid
) )
# 不是未支付、已完成订单，需要过滤配送日期 # 待接单的订单，只显示今天以及今天以前的订单
if status != OrderStatus.UNPAID and status != OrderStatus.COMPLETED: if status == OrderStatus.CREATED:
query = query.filter( query = query.filter(
ShippingOrderDB.delivery_date == datetime.now().date() ShippingOrderDB.delivery_date <= datetime.now().date()
) )
count = query.count() count = query.count()
@ -632,10 +632,10 @@ async def deliveryman_get_community_building_order_count(
ShippingOrderDB.deliveryman_user_id == current_user.userid ShippingOrderDB.deliveryman_user_id == current_user.userid
) )
# 如果订单状态不是待支付和已完成，则只显示今日配送的订单 # 待接单的订单，只显示今天以及今天以前的订单
if status not in [OrderStatus.UNPAID, OrderStatus.COMPLETED]: if OrderStatus.CREATED in status:
query = query.filter( query = query.filter(
ShippingOrderDB.delivery_date == datetime.now().date() ShippingOrderDB.delivery_date <= datetime.now().date()
) )
building_order_count = query.group_by( building_order_count = query.group_by(
@ -890,9 +890,9 @@ async def 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)
# 如果订单状态不是待支付和已完成，则只显示今日配送的订单 # 待接单的订单，只显示今天以及今天以前的订单
if OrderStatus.UNPAID not in statuses and OrderStatus.COMPLETED not in statuses: if OrderStatus.CREATED in statuses:
query = query.filter(ShippingOrderDB.delivery_date == datetime.now().date()) query = query.filter(ShippingOrderDB.delivery_date <= datetime.now().date())
# 楼栋筛选 # 楼栋筛选
if building_id: if building_id:
@ -912,7 +912,7 @@ async def deliveryman_orders(
# 获取分页数据 # 获取分页数据
results = query.order_by( results = query.order_by(
ShippingOrderDB.create_time.desc() ShippingOrderDB.time_period_from_time.asc()
).offset(skip).limit(limit).all() ).offset(skip).limit(limit).all()
# 格式化返回数据 # 格式化返回数据