XingQue/Django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 迁移闸门优先用小程序 club_id/X-Club-Id，避免源店不弹窗

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-07-29 03:23:57 +08:00
parent 9346123e8c
commit df89c82731
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jituan/views_club_migrate.py
View File

@@ -76,7 +76,11 @@ class ClubMigrateGateView(APIView):
parser_classes = [JSONParser]
def post(self, request):
club_id = (request.data.get('club_id') or _user_club(request.user)).strip()
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)
data = migrate_svc.gate_for_user(
club_id=club_id,
user_uid=str(request.user.UserUID),
@@ -91,7 +95,11 @@ class ClubMigratePreviewView(APIView):
parser_classes = [JSONParser]
def post(self, request):
club_id = (request.data.get('club_id') or _user_club(request.user)).strip()
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)
plan = migrate_svc.find_active_plan_for_source(club_id)
if not plan:
return Response({'code': 400, 'msg': '当前俱乐部无有效迁移计划'})
@@ -118,7 +126,11 @@ class ClubMigrateSetPasswordView(APIView):
parser_classes = [JSONParser]
def post(self, request):
club_id = (request.data.get('club_id') or _user_club(request.user)).strip()
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)
password = str(request.data.get('password') or '').strip()
password2 = str(request.data.get('password2') or '').strip()
if password != password2: