diff --git a/app/api/device_api.py b/app/api/device_api.py index 82c21f0..6efe139 100644 --- a/app/api/device_api.py +++ b/app/api/device_api.py @@ -174,7 +174,7 @@ def list_all_devices_admin(request): page = int(request.GET.get('page', 1)) page_size = int(request.GET.get('page_size', 20)) - start = (page - 1) * page_size + start = page * page_size total = qs.count() items = [_serialize_device(d) for d in qs[start:start + page_size]] diff --git a/app/services/payment_service.py b/app/services/payment_service.py index 2b6d480..c903434 100644 --- a/app/services/payment_service.py +++ b/app/services/payment_service.py @@ -136,8 +136,8 @@ class PaymentService: Returns: Decimal: 退款金额 """ - if not (0 < refund_ratio <= 1): - raise ValueError(f'退款比例必须在 (0, 1] 范围内: refund_ratio={refund_ratio}') + if refund_ratio < 0: + raise ValueError(f'退款比例不能为负数: refund_ratio={refund_ratio}') amount = Decimal(str(paid_amount)) * Decimal(str(refund_ratio)) return amount.quantize(Decimal('0.01'), rounding=ROUND_HALF_UP) diff --git a/app/services/user_service.py b/app/services/user_service.py index 6b825b9..a039cf5 100644 --- a/app/services/user_service.py +++ b/app/services/user_service.py @@ -101,6 +101,6 @@ class UserService: qs = qs.filter(phone__contains=phone) if nickname: qs = qs.filter(nickname__contains=nickname) - if is_active is not None: + if is_active: qs = qs.filter(is_active=is_active) return qs