From 73e1a28773e3550d71bf1ecb616e5db344bb1318 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Mon, 28 Apr 2025 15:39:06 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E5=AD=98=E6=AC=BE=E6=95=B0=E9=87=8F=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/__init__.py | 7 ------- zhenxun/builtin_plugins/mahiro_bank/data_source.py | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/zhenxun/builtin_plugins/mahiro_bank/__init__.py b/zhenxun/builtin_plugins/mahiro_bank/__init__.py index 2f6fbf1f..8e82cf08 100644 --- a/zhenxun/builtin_plugins/mahiro_bank/__init__.py +++ b/zhenxun/builtin_plugins/mahiro_bank/__init__.py @@ -95,13 +95,6 @@ _matcher = on_alconna( block=True, ) -_matcher.shortcut( - r"1111", - command="mahiro-bank", - arguments=["test"], - prefix=True, -) - _matcher.shortcut( r"存款\s*(?P\d+)?", command="mahiro-bank", diff --git a/zhenxun/builtin_plugins/mahiro_bank/data_source.py b/zhenxun/builtin_plugins/mahiro_bank/data_source.py index dc64fa16..b717e9a4 100644 --- a/zhenxun/builtin_plugins/mahiro_bank/data_source.py +++ b/zhenxun/builtin_plugins/mahiro_bank/data_source.py @@ -241,7 +241,7 @@ class BankManager: @classmethod async def get_bank_info(cls) -> bytes: now = datetime.now() - now_start = datetime.now() - timedelta( + now_start = now - timedelta( hours=now.hour, minutes=now.minute, seconds=now.second ) ( @@ -255,7 +255,9 @@ class BankManager: MahiroBank.annotate( amount_sum=Sum("amount"), user_count=Count("id") ).values("amount_sum", "user_count"), - MahiroBankLog.filter(create_time__gt=now_start).count(), + MahiroBankLog.filter( + create_time__gt=now_start, handle_type=BankHandleType.DEPOSIT + ).count(), MahiroBankLog.filter(handle_type=BankHandleType.INTEREST) .annotate(amount_sum=Sum("amount")) .values("amount_sum"),