fix: 点单端推荐官按UID绑定,二维码进首页且去掉邀请码

扫码参数改为 yaoqingren=UserUID 落地点单首页;海报默认不再复用管事背景;不影响打手端与支付抢单分红。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-07-21 02:48:16 +08:00
parent 60d8b52693
commit 435422e716
4 changed files with 76 additions and 76 deletions

View File

@@ -1,11 +1,10 @@
"""点单端 C 用户邀请:邀请码、换绑、店铺跟随"""
"""点单端老板推荐官:按推荐官 UserUID 绑定,店铺跟随。无邀请码"""
from django.db import transaction
from django.db.models import F
from shop.models import Dianpu, YonghuDianpuBangding
from users.models import YonghuCYaoqing
from users.business_models import User
from utils.invitationcode_utils import CreateInvitationCode, VerifyInvitationCode
import logging
@@ -13,33 +12,11 @@ logger = logging.getLogger(__name__)
def get_or_create_c_yaoqing(user):
"""获取或创建用户的点单端邀请扩展记录。"""
"""获取或创建用户的点单端推荐关系记录。"""
profile, _ = YonghuCYaoqing.objects.get_or_create(user=user)
return profile
def ensure_c_invite_code(user):
"""确保用户有邀请码,返回 (profile, yaoqingma, is_new)。"""
profile = get_or_create_c_yaoqing(user)
existing = (profile.yaoqingma or '').strip()
if existing:
return profile, existing, False
new_code = CreateInvitationCode(str(user.UserUID))
if not VerifyInvitationCode(new_code):
raise ValueError('邀请码生成失败')
# 极低概率冲突时再生成一次
if YonghuCYaoqing.query.filter(yaoqingma=new_code).exclude(pk=profile.pk).exists():
new_code = CreateInvitationCode(str(user.UserUID) + 'R')
if not VerifyInvitationCode(new_code):
raise ValueError('邀请码生成失败')
profile.yaoqingma = new_code
profile.save(update_fields=['yaoqingma', 'UpdateTime'])
return profile, new_code, True
def _unbind_shop(user_locked):
"""解除用户店铺绑定并扣减旧店绑定人数。"""
binding = (
@@ -60,7 +37,7 @@ def _unbind_shop(user_locked):
def _bind_shop(user_locked, dianpu_locked):
"""将用户绑定到指定店铺(已存在则换绑)。返回 (changed, msg)。"""
if dianpu_locked.zhuangtai != 1:
return False, '邀请人店铺已被封禁'
return False, '推荐官店铺已被封禁'
try:
existing = YonghuDianpuBangding.objects.select_for_update().get(yonghu=user_locked)
@@ -76,14 +53,14 @@ def _bind_shop(user_locked, dianpu_locked):
dianpu_locked.bangding_yonghushu = F('bangding_yonghushu') + 1
dianpu_locked.save(update_fields=['bangding_yonghushu'])
return True, '店铺已跟随邀请人换绑'
return True, '店铺已跟随推荐官换绑'
def sync_shop_from_inviter(invitee_user, inviter_user):
"""
邀请人店铺同步被邀请人店铺:
- 邀请人有正常店铺 → 被邀请人绑到同一店
- 邀请人无店铺 → 被邀请人解绑店铺(回落平台公共商品逻辑)
推荐官店铺同步被推荐人店铺:
- 推荐官有正常店铺 → 被推荐人绑到同一店
- 推荐官无店铺 → 被推荐人解绑店铺(回落平台公共商品逻辑)
须在 transaction.atomic 内调用。
"""
invitee_locked = User.objects.select_for_update().get(UserUUID=invitee_user.UserUUID)
@@ -106,31 +83,32 @@ def sync_shop_from_inviter(invitee_user, inviter_user):
'shop_synced': False,
'dianpu_id': None,
'changed': bool(old_id),
'msg': '邀请人未绑定店铺,已解除店铺绑定' if old_id else '邀请人未绑定店铺',
'msg': '推荐官未绑定店铺,已解除店铺绑定' if old_id else '推荐官未绑定店铺',
}
def bind_c_inviter_by_code(invitee_user, invite_code):
def bind_c_inviter_by_uid(invitee_user, inviter_uid):
"""
邀请码绑定/换绑邀请人,并同步店铺。
返回 dict: code/msg/data
推荐官 UserUID 绑定/换绑,并同步店铺。
扫码参数yaoqingren / inviterUid不是邀请码
"""
code = (invite_code or '').strip()
if not code:
return {'code': 400, 'msg': '邀请码不能为空', 'data': None}
if len(code) > 100:
return {'code': 400, 'msg': '邀请码格式错误', 'data': None}
uid = (inviter_uid or '').strip()
if not uid:
return {'code': 400, 'msg': '推荐官ID不能为空', 'data': None}
if len(uid) > 20:
return {'code': 400, 'msg': '推荐官ID格式错误', 'data': None}
try:
inviter_profile = YonghuCYaoqing.query.select_related('user').get(yaoqingma=code)
except YonghuCYaoqing.DoesNotExist:
return {'code': 404, 'msg': '邀请码无效', 'data': None}
inviter = User.query.get(UserUID=uid)
except User.DoesNotExist:
return {'code': 404, 'msg': '推荐官不存在', 'data': None}
inviter = inviter_profile.user
if inviter.UserUID == invitee_user.UserUID:
return {'code': 400, 'msg': '不能绑定自己为邀请人', 'data': None}
return {'code': 400, 'msg': '不能绑定自己为推荐官', 'data': None}
with transaction.atomic():
# 推荐官侧也要有档案,便于计数「我推荐的人」
inviter_profile = get_or_create_c_yaoqing(inviter)
invitee_profile = get_or_create_c_yaoqing(invitee_user)
invitee_profile = YonghuCYaoqing.objects.select_for_update().get(pk=invitee_profile.pk)
inviter_profile = YonghuCYaoqing.objects.select_for_update().get(pk=inviter_profile.pk)
@@ -142,7 +120,7 @@ def bind_c_inviter_by_code(invitee_user, invite_code):
shop_info = sync_shop_from_inviter(invitee_user, inviter)
return {
'code': 200,
'msg': '已绑定该邀请人',
'msg': '已绑定该推荐官',
'data': {
'yaoqingren': new_inviter_uid,
'rebinding': False,
@@ -150,7 +128,6 @@ def bind_c_inviter_by_code(invitee_user, invite_code):
},
}
# 换绑:旧邀请人计数 -1新邀请人 +1
if old_inviter_uid:
old_p = (
YonghuCYaoqing.objects.select_for_update()
@@ -170,12 +147,12 @@ def bind_c_inviter_by_code(invitee_user, invite_code):
shop_info = sync_shop_from_inviter(invitee_user, inviter)
logger.info(
'C端邀请绑定: invitee=%s inviter=%s old=%s shop=%s',
'点单端推荐官绑定: invitee=%s inviter=%s old=%s shop=%s',
invitee_user.UserUID, new_inviter_uid, old_inviter_uid, shop_info,
)
return {
'code': 200,
'msg': '绑定成功' if not old_inviter_uid else '已换绑邀请人',
'msg': '绑定成功' if not old_inviter_uid else '已换绑推荐官',
'data': {
'yaoqingren': new_inviter_uid,
'rebinding': bool(old_inviter_uid),