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 d36508a..276e738 100644 Binary files a/jobs.sqlite and b/jobs.sqlite differ