1、修改后台数据概览页面
2、增加对应是时间范围修改
This commit is contained in:
@@ -247,7 +247,10 @@ async def list_credit_records(
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(20, ge=1, le=100),
|
||||
user_id: str | None = Query(None),
|
||||
user_name: str | None = Query(None),
|
||||
type: str | None = Query(None),
|
||||
start_date: str = Query(None),
|
||||
end_date: str = Query(None),
|
||||
admin: User = Depends(get_admin_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
@@ -261,9 +264,25 @@ async def list_credit_records(
|
||||
if user_id:
|
||||
query = query.where(CreditRecord.user_id == user_id)
|
||||
count_query = count_query.where(CreditRecord.user_id == user_id)
|
||||
if user_name:
|
||||
query = query.where(User.username.like(f'%{user_name}%'))
|
||||
count_query = count_query.join(User, CreditRecord.user_id == User.id).where(User.username.like(f'%{user_name}%'))
|
||||
if type:
|
||||
query = query.where(CreditRecord.type == type)
|
||||
count_query = count_query.where(CreditRecord.type == type)
|
||||
|
||||
try:
|
||||
if start_date:
|
||||
date_start = datetime.strptime(start_date, "%Y-%m-%d")
|
||||
query = query.where(CreditRecord.created_at >= date_start)
|
||||
count_query = count_query.where(CreditRecord.created_at >= date_start)
|
||||
if end_date:
|
||||
date_end = datetime.strptime(end_date, "%Y-%m-%d")
|
||||
date_end = date_end.replace(hour=23, minute=59, second=59, microsecond=999999)
|
||||
query = query.where(CreditRecord.created_at <= date_end)
|
||||
count_query = count_query.where(CreditRecord.created_at <= date_end)
|
||||
except:
|
||||
pass
|
||||
|
||||
total = (await db.execute(count_query)).scalar() or 0
|
||||
result = await db.execute(query.offset((page - 1) * page_size).limit(page_size))
|
||||
@@ -1124,40 +1143,95 @@ async def list_operation_logs(
|
||||
async def get_stats(
|
||||
admin: User = Depends(get_admin_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
start_date: str = Query(None),
|
||||
end_date: str = Query(None),
|
||||
):
|
||||
total_users = (await db.execute(
|
||||
select(func.count(User.id)).where(User.user_type == "frontend")
|
||||
)).scalar() or 0
|
||||
total_projects = (await db.execute(select(func.count(Project.id)).where(Project.deleted_at.is_(None)))).scalar() or 0
|
||||
total_generations = (
|
||||
await db.execute(select(func.count(GenerationRecord.id)).where(GenerationRecord.deleted_at.is_(None)))
|
||||
).scalar() or 0
|
||||
total_revenue = (
|
||||
await db.execute(
|
||||
select(func.coalesce(func.sum(PaymentOrder.amount), 0)).where(
|
||||
PaymentOrder.status == "paid"
|
||||
)
|
||||
)
|
||||
).scalar() or 0
|
||||
|
||||
today_start = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
|
||||
try:
|
||||
if start_date:
|
||||
date_start = datetime.strptime(start_date, "%Y-%m-%d")
|
||||
else:
|
||||
date_start = today_start
|
||||
if end_date:
|
||||
date_end = datetime.strptime(end_date, "%Y-%m-%d")
|
||||
date_end = date_end.replace(hour=23, minute=59, second=59, microsecond=999999)
|
||||
else:
|
||||
date_end = datetime.now()
|
||||
except:
|
||||
date_start = today_start
|
||||
date_end = datetime.now()
|
||||
|
||||
today_start = datetime.now().replace(
|
||||
hour=0, minute=0, second=0, microsecond=0
|
||||
)
|
||||
credits_today = (
|
||||
await db.execute(
|
||||
select(func.coalesce(func.sum(func.abs(CreditRecord.amount)), 0)).where(
|
||||
CreditRecord.type == "consume",
|
||||
CreditRecord.created_at >= today_start,
|
||||
)
|
||||
total_projects = (await db.execute(
|
||||
select(func.count(Project.id)).where(
|
||||
Project.deleted_at.is_(None),
|
||||
Project.created_at >= date_start,
|
||||
Project.created_at <= date_end,
|
||||
)
|
||||
).scalar() or 0
|
||||
)).scalar() or 0
|
||||
|
||||
total_generations = (await db.execute(
|
||||
select(func.count(GenerationAITask.id)).where(
|
||||
GenerationAITask.created_at >= date_start,
|
||||
GenerationAITask.created_at <= date_end,
|
||||
)
|
||||
)).scalar() or 0
|
||||
|
||||
total_records = (await db.execute(
|
||||
select(func.count(GenerationRecord.id)).where(
|
||||
GenerationRecord.deleted_at.is_(None),
|
||||
GenerationRecord.created_at >= date_start,
|
||||
GenerationRecord.created_at <= date_end,
|
||||
)
|
||||
)).scalar() or 0
|
||||
|
||||
total_revenue = (await db.execute(
|
||||
select(func.coalesce(func.sum(PaymentOrder.amount), 0)).where(
|
||||
PaymentOrder.status == "paid",
|
||||
PaymentOrder.created_at >= date_start,
|
||||
PaymentOrder.created_at <= date_end,
|
||||
)
|
||||
)).scalar() or 0
|
||||
|
||||
credits_consumed = (await db.execute(
|
||||
select(func.coalesce(func.sum(func.abs(CreditRecord.amount)), 0)).where(
|
||||
CreditRecord.type == "consume",
|
||||
CreditRecord.created_at >= date_start,
|
||||
CreditRecord.created_at <= date_end,
|
||||
)
|
||||
)).scalar() or 0
|
||||
|
||||
alipay_revenue = (await db.execute(
|
||||
select(func.coalesce(func.sum(PaymentOrder.amount), 0)).where(
|
||||
PaymentOrder.status == "paid",
|
||||
PaymentOrder.payment_method == "alipay",
|
||||
PaymentOrder.created_at >= date_start,
|
||||
PaymentOrder.created_at <= date_end,
|
||||
)
|
||||
)).scalar() or 0
|
||||
|
||||
wechat_revenue = (await db.execute(
|
||||
select(func.coalesce(func.sum(PaymentOrder.amount), 0)).where(
|
||||
PaymentOrder.status == "paid",
|
||||
PaymentOrder.payment_method == "wechat",
|
||||
PaymentOrder.created_at >= date_start,
|
||||
PaymentOrder.created_at <= date_end,
|
||||
)
|
||||
)).scalar() or 0
|
||||
|
||||
return AdminStatsOut(
|
||||
total_users=total_users,
|
||||
total_projects=total_projects,
|
||||
total_generations=total_generations,
|
||||
total_records=total_records,
|
||||
total_revenue=float(total_revenue),
|
||||
credits_consumed_today=float(credits_today),
|
||||
credits_consumed_today=float(credits_consumed),
|
||||
today_alipay_revenue=float(alipay_revenue),
|
||||
today_wechat_revenue=float(wechat_revenue),
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user