fix: 切换俱乐部仅算本俱乐部角色权限,统一权限解析

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-07-06 19:00:18 +08:00
parent 553d2d5707
commit 45a4dde034
4 changed files with 57 additions and 54 deletions

View File

@@ -56,7 +56,7 @@ from orders.utils import (
from backend.utils import (
update_dashou_daily_by_action, update_guanshi_daily_by_action,
update_shangjia_daily, update_zuzhang_daily_by_action,
verify_kefu_permission, has_perm_code,
verify_kefu_permission, has_merchant_order_permission, has_perm_code,
)
from rank.utils import get_tag_fee, create_shenhe_jilu, validate_shenheguan
@@ -304,15 +304,7 @@ class KefuGetShangjiaOrderListView(APIView):
if kefu is None:
return permissions
from jituan.constants import CLUB_ID_DEFAULT
from jituan.services.admin_context import get_allowed_club_ids
from jituan.services.club_rbac import resolve_permission_codes_for_club
club_id = getattr(request, 'club_id', None) or CLUB_ID_DEFAULT
eff_codes = resolve_permission_codes_for_club(
request.user, club_id, list(get_allowed_club_ids(request.user)),
)
if not has_perm_code(permissions, '002ac') and '002ac' not in eff_codes:
if not has_merchant_order_permission(permissions):
return Response({'code': 403, 'msg': '您无权查看商家订单列表'})
# 4. 获取分页和筛选参数