From 621c34e7fdf9202cacda31f55b124da3aa4a3016 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Wed, 2 Apr 2025 09:17:21 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=AD=A3=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=98=E6=AC=BE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/mahiro_bank/data_source.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/zhenxun/builtin_plugins/mahiro_bank/data_source.py b/zhenxun/builtin_plugins/mahiro_bank/data_source.py index f1488201..723fa746 100644 --- a/zhenxun/builtin_plugins/mahiro_bank/data_source.py +++ b/zhenxun/builtin_plugins/mahiro_bank/data_source.py @@ -255,16 +255,21 @@ class BankManager: MahiroBank.annotate( amount_sum=Sum("amount"), user_count=Count("id") ).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) .annotate(amount_sum=Sum("amount")) .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)) .values("count"), - MahiroBank.annotate( - date=RawSQL("DATE(create_time)"), total_amount=Sum("amount") + MahiroBankLog.filter( + 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") .values("date", "total_amount"), ]