From bc1b65eb8d2fde7ab93dde73316b0de0b2c26845 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 13 Mar 2025 12:01:43 +0800
Subject: [PATCH] update

---
 app/api/endpoints/partner.py |  48 +++++++++++++++++------------------
 jobs.sqlite                  | Bin 24576 -> 24576 bytes
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/api/endpoints/partner.py b/app/api/endpoints/partner.py
index e6b59f4..6dd6a5d 100644
--- a/app/api/endpoints/partner.py
+++ b/app/api/endpoints/partner.py
@@ -50,15 +50,15 @@ async def partner_summary(
 
     today_order_count = db.query(ShippingOrderDB).filter(
         ShippingOrderDB.address_community_id.in_(community_ids),
-        ShippingOrderDB.create_time >= today_start,
-        ShippingOrderDB.create_time <= today_end,
+        ShippingOrderDB.completed_time >= today_start,
+        ShippingOrderDB.completed_time <= today_end,
         ShippingOrderDB.status == OrderStatus.COMPLETED
     ).count()
 
     yesterday_order_count = db.query(ShippingOrderDB).filter(
         ShippingOrderDB.address_community_id.in_(community_ids),
-        ShippingOrderDB.create_time >= yesterday_start,
-        ShippingOrderDB.create_time <= yesterday_end,
+        ShippingOrderDB.completed_time >= yesterday_start,
+        ShippingOrderDB.completed_time <= yesterday_end,
         ShippingOrderDB.status == OrderStatus.COMPLETED
     ).count()
 
@@ -71,15 +71,15 @@ async def partner_summary(
     # 获取今日、昨日收益
     today_income = db.query(func.sum(ShippingOrderDB.original_amount + ShippingOrderDB.additional_fee_amount)).filter(
         ShippingOrderDB.address_community_id.in_(community_ids),
-        ShippingOrderDB.create_time >= today_start,
-        ShippingOrderDB.create_time <= today_end,
+        ShippingOrderDB.completed_time >= today_start,
+        ShippingOrderDB.completed_time <= today_end,
         ShippingOrderDB.status == OrderStatus.COMPLETED
     ).scalar()
 
     yesterday_income = db.query(func.sum(ShippingOrderDB.original_amount + ShippingOrderDB.additional_fee_amount)).filter(
         ShippingOrderDB.address_community_id.in_(community_ids),
-        ShippingOrderDB.create_time >= yesterday_start,
-        ShippingOrderDB.create_time <= yesterday_end,
+        ShippingOrderDB.completed_time >= yesterday_start,
+        ShippingOrderDB.completed_time <= yesterday_end,
         ShippingOrderDB.status == OrderStatus.COMPLETED
     ).scalar()
 
@@ -138,30 +138,30 @@ async def partner_community_list(
 
         today_order_count = db.query(ShippingOrderDB).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= today_start,
-            ShippingOrderDB.create_time <= today_end,
+            ShippingOrderDB.completed_time >= today_start,
+            ShippingOrderDB.completed_time <= today_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED
         ).count()
 
         yesterday_order_count = db.query(ShippingOrderDB).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= yesterday_start,
-            ShippingOrderDB.create_time <= yesterday_end,
+            ShippingOrderDB.completed_time >= yesterday_start,
+            ShippingOrderDB.completed_time <= yesterday_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED
         ).count()
 
         # 获取今日、昨日收益
         today_income = db.query(func.sum(ShippingOrderDB.original_amount + ShippingOrderDB.additional_fee_amount)).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= today_start,
-            ShippingOrderDB.create_time <= today_end,
+            ShippingOrderDB.completed_time >= today_start,
+            ShippingOrderDB.completed_time <= today_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED
         ).scalar()
 
         yesterday_income = db.query(func.sum(ShippingOrderDB.original_amount + ShippingOrderDB.additional_fee_amount)).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= yesterday_start,
-            ShippingOrderDB.create_time <= yesterday_end,
+            ShippingOrderDB.completed_time >= yesterday_start,
+            ShippingOrderDB.completed_time <= yesterday_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED
         ).scalar()
         
@@ -276,16 +276,16 @@ async def partner_community_detail(
         # 今日订单数，昨日订单数
         today_order_count = db.query(ShippingOrderDB).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= today_start,
-            ShippingOrderDB.create_time <= today_end,
+            ShippingOrderDB.completed_time >= today_start,
+            ShippingOrderDB.completed_time <= today_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED,
             ShippingOrderDB.deliveryman_user_id == delivery.userid
         ).count()
 
         yesterday_order_count = db.query(ShippingOrderDB).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= yesterday_start,
-            ShippingOrderDB.create_time <= yesterday_end,
+            ShippingOrderDB.completed_time >= yesterday_start,
+            ShippingOrderDB.completed_time <= yesterday_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED,
             ShippingOrderDB.deliveryman_user_id == delivery.userid
         ).count()
@@ -293,16 +293,16 @@ async def partner_community_detail(
         # 今日收益，昨日收益
         today_income = db.query(func.sum(ShippingOrderDB.original_amount + ShippingOrderDB.additional_fee_amount)).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= today_start,
-            ShippingOrderDB.create_time <= today_end,
+            ShippingOrderDB.completed_time >= today_start,
+            ShippingOrderDB.completed_time <= today_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED,
             ShippingOrderDB.deliveryman_user_id == delivery.userid
         ).scalar()
 
         yesterday_income = db.query(func.sum(ShippingOrderDB.original_amount + ShippingOrderDB.additional_fee_amount)).filter(
             ShippingOrderDB.address_community_id == community_id,
-            ShippingOrderDB.create_time >= yesterday_start,
-            ShippingOrderDB.create_time <= yesterday_end,
+            ShippingOrderDB.completed_time >= yesterday_start,
+            ShippingOrderDB.completed_time <= yesterday_end,
             ShippingOrderDB.status == OrderStatus.COMPLETED,
             ShippingOrderDB.deliveryman_user_id == delivery.userid
         ).scalar()
diff --git a/jobs.sqlite b/jobs.sqlite
index d36508a37b3d83257ba23d7f7d6051a8328aecc8..276e738bc18dbeda975827de59c1e2790fdd4ee0 100644
GIT binary patch
delta 19
bcmZoTz}Rqrae_4C(up$8j7v8rEQkjHN)rcq

delta 19
bcmZoTz}Rqrae_4C{E0HojPo}pEQkjHNx27Z