fix: 积分处罚俱乐部过滤与 create_time;菜单增加提现/处罚详情
This commit is contained in:
@@ -92,11 +92,14 @@ def filter_penalty_record_qs(qs, request):
|
||||
if resolve_club_scope(request) == DATA_SCOPE_ALL:
|
||||
return qs
|
||||
club_id = resolve_club_id_from_request(request)
|
||||
if hasattr(qs.model, 'ClubID'):
|
||||
return qs.filter(ClubID=club_id)
|
||||
from django.db.models import Q
|
||||
from orders.models import Order
|
||||
from users.business_models import User
|
||||
user_ids = User.query.filter(ClubID=club_id).values_list('UserUID', flat=True)
|
||||
order_ids = Order.query.filter(ClubID=club_id).values_list('OrderID', flat=True)
|
||||
# ClubID 命中,或历史数据 club_id 未回填时按打手/订单归属俱乐部
|
||||
if hasattr(qs.model, 'ClubID'):
|
||||
return qs.filter(
|
||||
Q(ClubID=club_id) | Q(PlayerID__in=user_ids) | Q(OrderID__in=order_ids)
|
||||
)
|
||||
return qs.filter(Q(PlayerID__in=user_ids) | Q(OrderID__in=order_ids))
|
||||
|
||||
Reference in New Issue
Block a user