fix: 迁移积分/分红次数/冻结入账，并修正无计划误导文案

Co-authored-by: Cursor <cursoragent@cursor.com>

jituan/views_club_migrate.py

@@ -38,6 +38,34 @@ def _user_club(user) -> str:
     return str(getattr(user, 'ClubID', '') or '').strip()
 
 
+def _resolve_club_id(request) -> str:
+    """小程序 club 优先：body.club_id → X-Club-Id → 用户 ClubID。"""
+    club_id = str(request.data.get('club_id') or '').strip()
+    if not club_id:
+        club_id = (
+            request.META.get('HTTP_X_CLUB_ID')
+            or request.headers.get('X-Club-Id')
+            or ''
+        ).strip()
+    if not club_id:
+        club_id = _user_club(request.user)
+    return club_id
+
+
+def _no_source_plan_response(club_id: str):
+    """无源店计划时给可区分文案（避免前端笼统「暂无迁移计划」）。"""
+    cid = (club_id or '').strip() or '(空)'
+    target = migrate_svc.find_active_plan_for_target(club_id) if club_id else None
+    if target:
+        msg = (
+            f'本店({cid})是迁入目标店，请到源店小程序'
+            f'({target.from_club_id})完成迁出'
+        )
+    else:
+        msg = f'当前俱乐部({cid})无有效迁出计划，请确认后台源店/启用/时间窗'
+    return Response({'code': 400, 'msg': msg, 'data': {'club_id': cid, 'is_target': bool(target)}})
+
+
 def _user_roles(user) -> list:
     roles = []
     for role, attr in (
@@ -76,16 +104,13 @@ class ClubMigrateGateView(APIView):
     parser_classes = [JSONParser]
 
     def post(self, request):
-        club_id = (request.data.get('club_id') or '').strip()
-        if not club_id:
-            club_id = (request.META.get('HTTP_X_CLUB_ID') or request.headers.get('X-Club-Id') or '').strip()
-        if not club_id:
-            club_id = _user_club(request.user)
+        club_id = _resolve_club_id(request)
         data = migrate_svc.gate_for_user(
             club_id=club_id,
             user_uid=str(request.user.UserUID),
             roles=_user_roles(request.user),
         )
+        data['resolved_club_id'] = club_id or ''
         return Response({'code': 0, 'msg': 'ok', 'data': data})
 
 
@@ -95,27 +120,29 @@ class ClubMigratePreviewView(APIView):
     parser_classes = [JSONParser]
 
     def post(self, request):
-        club_id = (request.data.get('club_id') or '').strip()
-        if not club_id:
-            club_id = (request.META.get('HTTP_X_CLUB_ID') or request.headers.get('X-Club-Id') or '').strip()
-        if not club_id:
-            club_id = _user_club(request.user)
+        club_id = _resolve_club_id(request)
         plan = migrate_svc.find_active_plan_for_source(club_id)
         if not plan:
-            return Response({'code': 400, 'msg': '当前俱乐部无有效迁移计划'})
+            return _no_source_plan_response(club_id)
         uid = str(request.user.UserUID)
-        ok, msg = migrate_svc.check_conditions(plan, uid)
+        try:
+            ok, msg = migrate_svc.check_conditions(plan, uid)
+            assets = migrate_svc.preview_assets(plan, uid)
+        except Exception as e:
+            logger.exception('migrate preview failed club=%s uid=%s: %s', club_id, uid, e)
+            return Response({'code': 500, 'msg': f'预览加载失败：{e}'})
         return Response({
             'code': 0,
             'msg': 'ok',
             'data': {
                 'plan': migrate_svc.serialize_plan(plan),
-                'assets': migrate_svc.preview_assets(plan, uid),
+                'assets': assets,
                 'condition_ok': ok,
                 'condition_msg': msg,
                 'can_migrate': migrate_svc.can_migrate_again(plan, uid),
                 'success_count': migrate_svc.success_count(plan.plan_id, uid),
                 'max_allowed': migrate_svc.max_allowed_success(plan, uid),
+                'resolved_club_id': club_id or '',
             },
         })
 
@@ -126,18 +153,14 @@ class ClubMigrateSetPasswordView(APIView):
     parser_classes = [JSONParser]
 
     def post(self, request):
-        club_id = (request.data.get('club_id') or '').strip()
-        if not club_id:
-            club_id = (request.META.get('HTTP_X_CLUB_ID') or request.headers.get('X-Club-Id') or '').strip()
-        if not club_id:
-            club_id = _user_club(request.user)
+        club_id = _resolve_club_id(request)
         password = str(request.data.get('password') or '').strip()
         password2 = str(request.data.get('password2') or '').strip()
         if password != password2:
             return Response({'code': 400, 'msg': '两次密码不一致'})
         plan = migrate_svc.find_active_plan_for_source(club_id)
         if not plan:
-            return Response({'code': 400, 'msg': '当前俱乐部无有效迁移计划'})
+            return _no_source_plan_response(club_id)
 
         token_row, err = migrate_svc.set_password_and_issue(
             plan=plan,
@@ -171,11 +194,11 @@ class ClubMigrateIssueQrView(APIView):
         from jituan.models import ClubMigrateToken
         from jituan.services.club_migrate_qr import generate_migrate_qrcode
 
-        club_id = (request.data.get('club_id') or _user_club(request.user)).strip()
+        club_id = _resolve_club_id(request)
         uid = str(request.user.UserUID)
         plan = migrate_svc.find_active_plan_for_source(club_id)
         if not plan:
-            return Response({'code': 400, 'msg': '当前俱乐部无有效迁移计划'})
+            return _no_source_plan_response(club_id)
         token_row = (
             ClubMigrateToken.query.filter(
                 plan_id=plan.plan_id,