Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修正每日日期存款显示

Browse Source
This commit is contained in:
HibiKier 2025-04-02 09:17:21 +08:00
parent aa9d6ee729
commit 621c34e7fd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zhenxun/builtin_plugins/mahiro_bank/data_source.py
View File

@ -255,16 +255,21 @@ class BankManager:
MahiroBank.annotate( MahiroBank.annotate(
amount_sum=Sum("amount"), user_count=Count("id") amount_sum=Sum("amount"), user_count=Count("id")
).values("amount_sum", "user_count"), ).values("amount_sum", "user_count"),
MahiroBankLog.filter(create_time__gte=now_start).count(), MahiroBankLog.filter(create_time__gt=now_start).count(),
MahiroBankLog.filter(handle_type=BankHandleType.INTEREST) MahiroBankLog.filter(handle_type=BankHandleType.INTEREST)
.annotate(amount_sum=Sum("amount")) .annotate(amount_sum=Sum("amount"))
.values("amount_sum"), .values("amount_sum"),
MahiroBankLog.filter(create_time__gte=now_start - timedelta(days=7)) MahiroBankLog.filter(
create_time__gte=now_start - timedelta(days=7),
handle_type=BankHandleType.DEPOSIT,
)
.annotate(count=Count("user_id", distinct=True)) .annotate(count=Count("user_id", distinct=True))
.values("count"), .values("count"),
MahiroBank.annotate( MahiroBankLog.filter(
date=RawSQL("DATE(create_time)"), total_amount=Sum("amount") create_time__gte=now_start - timedelta(days=7),
handle_type=BankHandleType.DEPOSIT,
) )
.annotate(date=RawSQL("DATE(create_time)"), total_amount=Sum("amount"))
.group_by("date") .group_by("date")
.values("date", "total_amount"), .values("date", "total_amount"),
] ]