From b6507f7a3d98358a9ac82c99d15f568a34c103f0 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Sun, 9 Mar 2025 00:22:12 +0800
Subject: [PATCH] upddate

---
 app/api/endpoints/order.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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