feat: 角色协议(勾选+阅读秒数+卡点)与冻结说明按身份返回

新增协议表/签署留痕、后台与小程序 API；去掉手写依赖；支持抢单/注册/提现等卡点配置。冻结问号文案按角色字典下发。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-26 20:22:12 +08:00
parent 6c96eb3bcb
commit fa6e679cbe
15 changed files with 834 additions and 35 deletions
--- a/users/urls.py
+++ b/users/urls.py
@@ -18,7 +18,8 @@ from .views import WechatMiniProgramLoginView, UserInfoUpdateView, DashouXinxiAP
    FaKuanJiFenTongJiView, DaShouFaKuanLieBiaoView, ShangjiaCufaTongjiView, ShangjiaFakuanLieBiaoView,\
    FaKuanShenSuView, FaKuanPayView,FaKuanHuitiaoView, FaKuanPayPollView, FaKuanPayFailView,KaohePayView,KaohePayCallbackView, KaohePayPollView,KaohePayFailView, TixianAssetView, GuanshiContactView,TixianQueRenAutoView, TixianShenqingV3View, TixianCallbackV3View, \
    GetUserPhoneView, BindUserPhoneView, BossSearchDashouView, \
-    FundFreezeMineView, FundFreezeMyLedgerView, FundFreezeMyLedgerDetailView
+    FundFreezeMineView, FundFreezeMyLedgerView, FundFreezeMyLedgerDetailView, \
+    RoleAgreementCurrentView, RoleAgreementMineView, RoleAgreementSignView
 from .tixian_shenhe_views import TixianZddkshApplyView
 from .paihang_views import PhbHqsjView
 from .xzj_paihang_views import XzjPhbHqsjView
@@ -168,6 +169,9 @@ urlpatterns = [
    path('fund-freeze-mine', FundFreezeMineView.as_view(), name='小程序冻结资金汇总'),
    path('fund-freeze-ledger', FundFreezeMyLedgerView.as_view(), name='小程序冻结资金明细'),
    path('fund-freeze-ledger-detail', FundFreezeMyLedgerDetailView.as_view(), name='小程序冻结单详情'),
+    path('role-agreement/current', RoleAgreementCurrentView.as_view(), name='小程序角色协议当前'),
+    path('role-agreement/mine', RoleAgreementMineView.as_view(), name='小程序角色协议列表'),
+    path('role-agreement/sign', RoleAgreementSignView.as_view(), name='小程序角色协议签署'),
    path('guanshi_contact', GuanshiContactView.as_view(), name='获取组长'),


--- a/users/views/init.py
+++ b/users/views/init.py
@@ -68,6 +68,12 @@ from .fund_freeze_mp import (
    FundFreezeMyLedgerView,
 )

+from .role_agreement_mp import (
+    RoleAgreementCurrentView,
+    RoleAgreementMineView,
+    RoleAgreementSignView,
+)
+
 from .admin import (
    AdGetOrderList,
    AdGetOrderTypes,
--- a/users/views/fund_freeze_mp.py
+++ b/users/views/fund_freeze_mp.py
@@ -66,6 +66,33 @@ def _profile_withdrawable(user, attr: str, field: str = 'yue') -> str:
        return '0.00'


+def _default_freeze_reason() -> str:
+    return (
+        '部分佣金暂存为冻结保障金，用于订单售后与纠纷保障；'
+        '按俱乐部规则到期或达标后自动转入可提现余额，冻结中金额不可提现。'
+    )
+
+
+def _freeze_display_reasons(club_id: str) -> Dict[str, str]:
+    """按角色返回冻结说明；无配置时用统一默认文案。"""
+    default = _default_freeze_reason()
+    out = {
+        ROLE_DASHOU: default,
+        ROLE_GUANSHI: default,
+        ROLE_ZUZHANG: default,
+        ROLE_SHENHEGUAN: default,
+    }
+    if not club_id:
+        return out
+    try:
+        for row in ClubFundFreezeConfig.query.filter(club_id=club_id):
+            if row.role in out and (row.remark or '').strip():
+                out[row.role] = row.remark.strip()
+    except Exception:
+        pass
+    return out
+
+
 class FundFreezeMineView(APIView):
    """
    POST /yonghu/fund-freeze-mine
@@ -110,17 +137,8 @@ class FundFreezeMineView(APIView):
        total_dongjie = sum((Decimal(r['dongjie_yue']) for r in roles), Decimal('0.00'))
        total_withdrawable = sum((Decimal(r['withdrawable']) for r in roles), Decimal('0.00'))

-        # 用户可见说明：优先打手规则，否则取任意已配置角色
-        display_reason = ''
-        if club_id:
-            cfgs = list(ClubFundFreezeConfig.query.filter(club_id=club_id, enabled=True))
-            prefer = next((c for c in cfgs if c.role == ROLE_DASHOU), None) or (cfgs[0] if cfgs else None)
-            if prefer and prefer.remark:
-                display_reason = prefer.remark
-            if not display_reason:
-                any_cfg = ClubFundFreezeConfig.query.filter(club_id=club_id).exclude(remark='').first()
-                if any_cfg:
-                    display_reason = any_cfg.remark or ''
+        reasons = _freeze_display_reasons(club_id)
+        display_reason = reasons.get(ROLE_DASHOU) or _default_freeze_reason()

        return Response({
            'code': 200,
@@ -132,10 +150,8 @@ class FundFreezeMineView(APIView):
                'total_dongjie': _money(total_dongjie),
                'total_withdrawable': _money(total_withdrawable),
                'has_freeze': total_dongjie > 0,
-                'display_reason': display_reason or (
-                    '部分佣金暂存为冻结保障金，用于订单售后与纠纷保障；'
-                    '按俱乐部规则到期或达标后自动转入可提现余额，冻结中金额不可提现。'
-                ),
+                'display_reason': display_reason,
+                'freeze_display_reasons': reasons,
            },
        })

--- a/users/views/role_agreement_mp.py
+++ b/users/views/role_agreement_mp.py
@@ -0,0 +1,85 @@
+"""小程序角色协议只读/签署（勾选确认，无手写）。"""
+from rest_framework.parsers import FormParser, JSONParser, MultiPartParser
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from jituan.services.club_user import get_user_club_id
+from jituan.services import role_agreement as svc
+
+
+class RoleAgreementCurrentView(APIView):
+    """
+    POST /yonghu/role-agreement/current
+    body: { role, gate?, view? }
+    gate: qiangdan|register|tixian|invite — 按卡点判断是否需签
+    view: 1/true — 只读查看，不强制签署
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        role = (request.data.get('role') or '').strip().lower()
+        if not role:
+            return Response({'code': 400, 'msg': '缺少 role', 'data': None})
+        gate = (request.data.get('gate') or '').strip().lower()
+        view_raw = request.data.get('view') or request.data.get('view_only')
+        view_only = view_raw in (True, 'true', '1', 1, 'True')
+        club_id = get_user_club_id(request.user) or ''
+        data = svc.get_current_for_user(
+            club_id, request.user.UserUID, role, gate=gate, view_only=view_only,
+        )
+        return Response({'code': 200, 'msg': 'ok', 'data': data})
+
+
+class RoleAgreementMineView(APIView):
+    """
+    POST /yonghu/role-agreement/mine
+    body: { roles?: ['dashou','guanshi'] } — 我的协议列表（按俱乐部）
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        roles = request.data.get('roles')
+        if isinstance(roles, str):
+            roles = [x.strip() for x in roles.split(',') if x.strip()]
+        if not isinstance(roles, list):
+            roles = None
+        club_id = get_user_club_id(request.user) or ''
+        data = svc.list_for_user(club_id, request.user.UserUID, roles=roles)
+        return Response({'code': 200, 'msg': 'ok', 'data': data})
+
+
+class RoleAgreementSignView(APIView):
+    """
+    POST /yonghu/role-agreement/sign
+    JSON: { role, agreed, client_meta? }
+    """
+    permission_classes = [IsAuthenticated]
+    parser_classes = [JSONParser, FormParser, MultiPartParser]
+
+    def post(self, request):
+        role = (request.data.get('role') or '').strip().lower()
+        agreed_raw = request.data.get('agreed')
+        agreed = agreed_raw in (True, 'true', '1', 1, 'True')
+        club_id = get_user_club_id(request.user) or ''
+
+        meta = request.data.get('client_meta')
+        if isinstance(meta, str):
+            try:
+                import json
+                meta = json.loads(meta)
+            except Exception:
+                meta = {'raw': meta}
+        if not isinstance(meta, dict):
+            meta = {}
+
+        data, msg = svc.sign_agreement(
+            club_id,
+            request.user.UserUID,
+            role,
+            client_meta=meta,
+            agreed=agreed,
+        )
+        if msg:
+            return Response({'code': 400, 'msg': msg, 'data': None})
+        return Response({'code': 200, 'msg': '签署成功', 'data': data})
--- a/users/views/tixian.py
+++ b/users/views/tixian.py
@@ -1112,29 +1112,14 @@ class TixianAssetView(APIView):

        from jituan.services.club_user import get_user_club_id
        from jituan.services.withdraw_config import build_tixian_asset_rates
-        from jituan.models import ClubFundFreezeConfig
+        from users.views.fund_freeze_mp import _freeze_display_reasons, _default_freeze_reason

        club_id = get_user_club_id(user)
        data.update(build_tixian_asset_rates(club_id))

-        display_reason = ''
-        try:
-            if club_id:
-                prefer = ClubFundFreezeConfig.query.filter(
-                    club_id=club_id, role='dashou', enabled=True,
-                ).first()
-                if not prefer:
-                    prefer = ClubFundFreezeConfig.query.filter(
-                        club_id=club_id, enabled=True,
-                    ).exclude(remark='').first()
-                if prefer:
-                    display_reason = prefer.remark or ''
-        except Exception:
-            pass
-        data['freeze_display_reason'] = display_reason or (
-            '部分佣金暂存为冻结保障金，用于订单售后与纠纷保障；'
-            '按规则解冻后自动转入可提现，冻结中不可提现。'
-        )
+        reasons = _freeze_display_reasons(club_id or '')
+        data['freeze_display_reasons'] = reasons
+        data['freeze_display_reason'] = reasons.get('dashou') or _default_freeze_reason()

        return Response({
            'code': 200,