feat: 超管任职分配、俱乐部创建与bootstrap、角色update_role

jituan/views.py

@@ -10,7 +10,7 @@ from rest_framework.views import APIView
 from rest_framework.throttling import AnonRateThrottle
 from rest_framework_simplejwt.tokens import RefreshToken
 
-from jituan.constants import SUPER_ADMIN_PHONES, ADMIN_ROLE_LABELS, CLUB_ID_DEFAULT
+from jituan.constants import SUPER_ADMIN_PHONES, ADMIN_ROLE_LABELS, CLUB_ID_DEFAULT, DATA_SCOPE_ALL, DATA_SCOPE_SINGLE
 from jituan.models import Club, AdminAssignment
 from jituan.services.admin_context import build_admin_club_context
 from jituan.services.wechat_login import login_or_register_by_club
@@ -196,10 +196,43 @@ class ClubMeContextView(APIView):
 
 
 class ClubAdminAssignmentListView(APIView):
-    """POST /jituan/houtai/admin-assignments — 查看数据范围任职（非 gvsdsdk 功能权限）。"""
+    """POST /jituan/houtai/admin-assignments — 数据范围任职（非 gvsdsdk 功能权限）。"""
+
     permission_classes = [IsAuthenticated]
     parser_classes = [JSONParser]
 
+    def _is_super(self, user):
+        return (
+            bool(user.IsSuperuser)
+            or user.UserType == 'admin'
+            or getattr(user, 'Phone', '') in SUPER_ADMIN_PHONES
+        )
+
+    def _list_rows(self, assignments):
+        club_name_map = {c.club_id: c.name for c in Club.query.filter(status=1)}
+        uids = list({a.yonghuid for a in assignments})
+        user_map = {}
+        if uids:
+            for u in User.query.filter(UserUID__in=uids).only('UserUID', 'Phone', 'UserName'):
+                user_map[u.UserUID] = u.Phone or u.UserName or u.UserUID
+        rows = []
+        for a in assignments:
+            club_label = '集团（全部子公司）'
+            if a.club_id:
+                club_label = club_name_map.get(a.club_id, a.club_id)
+            rows.append({
+                'id': a.id,
+                'yonghuid': a.yonghuid,
+                'phone': user_map.get(a.yonghuid, ''),
+                'club_id': a.club_id,
+                'club_label': club_label,
+                'role_code': a.role_code,
+                'role_name': ADMIN_ROLE_LABELS.get(a.role_code, a.role_code),
+                'data_scope': a.data_scope,
+                'is_primary': a.is_primary,
+            })
+        return rows
+
     def post(self, request):
         try:
             username = (request.data.get('phone') or request.data.get('username') or '').strip()
@@ -210,57 +243,103 @@ class ClubAdminAssignmentListView(APIView):
                 return permissions
 
             user = request.user
-            is_super = (
-                bool(user.IsSuperuser)
-                or user.UserType == 'admin'
-                or getattr(user, 'Phone', '') in SUPER_ADMIN_PHONES
-            )
+            is_super = self._is_super(user)
+            action = (request.data.get('action') or 'list').strip()
+
+            if action in ('create', 'update', 'delete'):
+                if not is_super or '000001' not in permissions:
+                    return Response({'code': 403, 'msg': '仅超级管理员可维护任职数据'}, status=403)
+
+                if action == 'create':
+                    yonghuid = (request.data.get('yonghuid') or '').strip()
+                    phone = (request.data.get('target_phone') or '').strip()
+                    if not yonghuid and phone:
+                        target = User.query.filter(Phone=phone).first()
+                        if not target:
+                            return Response({'code': 404, 'msg': f'未找到手机号 {phone}'})
+                        yonghuid = target.UserUID
+                    if not yonghuid:
+                        return Response({'code': 400, 'msg': '需要 yonghuid 或 target_phone'})
+                    club_id = request.data.get('club_id')
+                    if club_id is not None and str(club_id).strip() == '':
+                        club_id = None
+                    elif club_id is not None:
+                        club_id = str(club_id).strip()
+                    role_code = (request.data.get('role_code') or 'CLUB_ADMIN').strip()
+                    data_scope = (request.data.get('data_scope') or DATA_SCOPE_SINGLE).strip()
+                    if club_id is None:
+                        data_scope = DATA_SCOPE_ALL
+                    is_primary = bool(request.data.get('is_primary', False))
+                    if AdminAssignment.query.filter(
+                        yonghuid=yonghuid, club_id=club_id, role_code=role_code,
+                    ).exists():
+                        return Response({'code': 400, 'msg': '该任职记录已存在'})
+                    AdminAssignment.query.create(
+                        yonghuid=yonghuid,
+                        club_id=club_id,
+                        role_code=role_code,
+                        data_scope=data_scope,
+                        is_primary=is_primary,
+                        granted_by=user.UserUID,
+                        status=1,
+                    )
+                    return Response({'code': 0, 'msg': '任职已添加'})
+
+                if action == 'delete':
+                    assignment_id = request.data.get('id')
+                    if not assignment_id:
+                        return Response({'code': 400, 'msg': '缺少任职 id'})
+                    row = AdminAssignment.query.filter(id=assignment_id).first()
+                    if not row:
+                        return Response({'code': 404, 'msg': '任职记录不存在'})
+                    row.status = 0
+                    row.save(update_fields=['status', 'UpdateTime'])
+                    return Response({'code': 0, 'msg': '任职已停用'})
+
+                if action == 'update':
+                    assignment_id = request.data.get('id')
+                    if not assignment_id:
+                        return Response({'code': 400, 'msg': '缺少任职 id'})
+                    row = AdminAssignment.query.filter(id=assignment_id, status=1).first()
+                    if not row:
+                        return Response({'code': 404, 'msg': '任职记录不存在'})
+                    if 'role_code' in request.data:
+                        row.role_code = (request.data.get('role_code') or '').strip() or row.role_code
+                    if 'data_scope' in request.data:
+                        row.data_scope = request.data.get('data_scope') or row.data_scope
+                    if 'is_primary' in request.data:
+                        row.is_primary = bool(request.data.get('is_primary'))
+                    if 'club_id' in request.data:
+                        cid = request.data.get('club_id')
+                        row.club_id = None if cid is None or str(cid).strip() == '' else str(cid).strip()
+                        if row.club_id is None:
+                            row.data_scope = DATA_SCOPE_ALL
+                    row.granted_by = user.UserUID
+                    row.save()
+                    return Response({'code': 0, 'msg': '任职已更新'})
+
             if is_super:
                 qs = AdminAssignment.query.filter(status=1).order_by('yonghuid', '-is_primary', 'club_id')
             else:
                 qs = AdminAssignment.query.filter(yonghuid=user.UserUID, status=1).order_by('-is_primary')
 
-            assignments = qs.to_list()
-            club_name_map = {
-                c.club_id: c.name for c in Club.query.filter(status=1)
-            }
-            uids = list({a.yonghuid for a in assignments})
-            user_map = {}
-            if uids:
-                for u in User.query.filter(UserUID__in=uids).only('UserUID', 'Phone', 'UserName'):
-                    user_map[u.UserUID] = u.Phone or u.UserName or u.UserUID
-
-            rows = []
-            for a in assignments:
-                club_label = '集团（全部子公司）'
-                if a.club_id:
-                    club_label = club_name_map.get(a.club_id, a.club_id)
-                rows.append({
-                    'yonghuid': a.yonghuid,
-                    'phone': user_map.get(a.yonghuid, ''),
-                    'club_id': a.club_id,
-                    'club_label': club_label,
-                    'role_code': a.role_code,
-                    'role_name': ADMIN_ROLE_LABELS.get(a.role_code, a.role_code),
-                    'data_scope': a.data_scope,
-                    'is_primary': a.is_primary,
-                })
-
             return Response({
                 'code': 0,
                 'msg': 'ok',
                 'data': {
-                    'list': rows,
+                    'list': self._list_rows(qs.to_list()),
+                    'can_manage': is_super and '000001' in permissions,
                     'perm_note': (
-                        '功能菜单权限（能进哪些页面）在「角色管理」配置；'
-                        '本表 admin_assignment 仅控制集团/子公司数据范围。'
+                        '【功能权限】在「角色管理」里给账号绑 gvsdsdk 角色（perm_code 如 caiwu、002ab）；'
+                        '【数据范围】在本页维护 admin_assignment（能看哪个俱乐部/集团汇总）。'
+                        '两套独立，超管需有 000001 权限码。'
                     ),
                     'current_context': build_admin_club_context(user),
                 },
             })
         except Exception:
             logger.exception('ClubAdminAssignmentListView 异常')
-            return Response({'code': 99, 'msg': '加载任职数据失败，请确认已执行 migrate jituan'}, status=500)
+            return Response({'code': 99, 'msg': '任职数据操作失败，请确认已执行 migrate jituan'}, status=500)
 
 
 class ClubManageView(APIView):
@@ -350,7 +429,28 @@ class ClubManageView(APIView):
                     'data': self._serialize(club, full=True),
                 })
 
-            return Response({'code': 400, 'msg': '无效 action，支持 list/get/update'})
+            if action == 'create':
+                from jituan.services.club_bootstrap import bootstrap_club_from_template
+                new_club_id = (request.data.get('new_club_id') or request.data.get('club_id') or '').strip()
+                name = (request.data.get('name') or '').strip()
+                if not new_club_id or not name:
+                    return Response({'code': 400, 'msg': '新建俱乐部需要 new_club_id 与 name'})
+                try:
+                    club = bootstrap_club_from_template(
+                        new_club_id,
+                        name,
+                        wx_appid=(request.data.get('wx_appid') or '').strip(),
+                        template_club_id=(request.data.get('from_club') or CLUB_ID_DEFAULT).strip(),
+                    )
+                except ValueError as exc:
+                    return Response({'code': 400, 'msg': str(exc)})
+                return Response({
+                    'code': 0,
+                    'msg': '俱乐部创建成功',
+                    'data': self._serialize(club, full=True),
+                })
+
+            return Response({'code': 400, 'msg': '无效 action，支持 list/get/update/create'})
         except Exception:
             logger.exception('ClubManageView 异常')
             return Response({'code': 99, 'msg': '俱乐部配置操作失败'}, status=500)