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-03-13 12:01:43 +08:00
parent 42de947521
commit bc1b65eb8d
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/api/endpoints/partner.py
View File

@ -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()

BIN
jobs.sqlite
View File

Binary file not shown.