feat: 点单端邀请绑定与只看审核商品开关
复用 ClubMiniappIcon 增加点单端海报背景;新增 C 端邀请码/换绑店铺接口;hqsp 支持 zhi_kan_shenhe,不影响支付抢单分红。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
42
users/migrations/0006_yonghu_c_yaoqing.py
Normal file
42
users/migrations/0006_yonghu_c_yaoqing.py
Normal file
@@ -0,0 +1,42 @@
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('users', '0005_dashou_zengsong_huiyuan'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='YonghuCYaoqing',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('yaoqingma', models.CharField(blank=True, db_index=True, max_length=20, null=True, verbose_name='邀请码')),
|
||||
('invite_qrcode_url', models.CharField(blank=True, max_length=500, null=True, verbose_name='邀请小程序码URL')),
|
||||
('yaogingshuliang', models.IntegerField(default=0, verbose_name='邀请人数')),
|
||||
('yaoqingren', models.CharField(blank=True, db_index=True, max_length=7, null=True, verbose_name='邀请人UserUID')),
|
||||
('CreateTime', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
|
||||
('UpdateTime', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
|
||||
('user', models.OneToOneField(db_column='UserUUID', on_delete=django.db.models.deletion.CASCADE, related_name='CYaoqingProfile', to='users.user', verbose_name='关联用户')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '点单端用户邀请',
|
||||
'verbose_name_plural': '点单端用户邀请',
|
||||
'db_table': 'yonghu_c_yaoqing',
|
||||
},
|
||||
),
|
||||
migrations.AddIndex(
|
||||
model_name='yonghucyaoqing',
|
||||
index=models.Index(fields=['user'], name='yonghu_c_ya_user_id_idx'),
|
||||
),
|
||||
migrations.AddIndex(
|
||||
model_name='yonghucyaoqing',
|
||||
index=models.Index(fields=['yaoqingma'], name='yonghu_c_ya_yaoqing_idx'),
|
||||
),
|
||||
migrations.AddIndex(
|
||||
model_name='yonghucyaoqing',
|
||||
index=models.Index(fields=['yaoqingren'], name='yonghu_c_ya_yaoqingr_idx'),
|
||||
),
|
||||
]
|
||||
@@ -106,6 +106,34 @@ class UserBoss(QModel):
|
||||
indexes = [models.Index(fields=['user']), ]
|
||||
|
||||
|
||||
# ==================== 点单端 C 用户邀请 ====================
|
||||
class YonghuCYaoqing(QModel):
|
||||
"""点单端用户邀请关系(邀请码 / 邀请人 / 邀请人数)"""
|
||||
user = models.OneToOneField(
|
||||
'users.User',
|
||||
on_delete=models.CASCADE,
|
||||
related_name='CYaoqingProfile',
|
||||
verbose_name='关联用户',
|
||||
db_column='UserUUID',
|
||||
)
|
||||
yaoqingma = models.CharField(max_length=20, null=True, blank=True, db_index=True, verbose_name='邀请码')
|
||||
invite_qrcode_url = models.CharField(max_length=500, null=True, blank=True, verbose_name='邀请小程序码URL')
|
||||
yaogingshuliang = models.IntegerField(default=0, verbose_name='邀请人数')
|
||||
yaoqingren = models.CharField(max_length=7, null=True, blank=True, db_index=True, verbose_name='邀请人UserUID')
|
||||
CreateTime = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
UpdateTime = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
|
||||
class Meta:
|
||||
db_table = 'yonghu_c_yaoqing'
|
||||
verbose_name = '点单端用户邀请'
|
||||
verbose_name_plural = verbose_name
|
||||
indexes = [
|
||||
models.Index(fields=['user']),
|
||||
models.Index(fields=['yaoqingma']),
|
||||
models.Index(fields=['yaoqingren']),
|
||||
]
|
||||
|
||||
|
||||
# ==================== 打手扩展表 ====================
|
||||
class UserDashou(QModel):
|
||||
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='DashouProfile',
|
||||
|
||||
1
users/services/__init__.py
Normal file
1
users/services/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# users.services package
|
||||
184
users/services/c_invite.py
Normal file
184
users/services/c_invite.py
Normal file
@@ -0,0 +1,184 @@
|
||||
"""点单端 C 用户邀请:邀请码、换绑、店铺跟随。"""
|
||||
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
|
||||
|
||||
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 = (
|
||||
YonghuDianpuBangding.objects.select_for_update()
|
||||
.filter(yonghu=user_locked)
|
||||
.select_related('dianpu')
|
||||
.first()
|
||||
)
|
||||
if not binding:
|
||||
return None
|
||||
old = binding.dianpu
|
||||
old.bangding_yonghushu = F('bangding_yonghushu') - 1
|
||||
old.save(update_fields=['bangding_yonghushu'])
|
||||
binding.delete()
|
||||
return old.id
|
||||
|
||||
|
||||
def _bind_shop(user_locked, dianpu_locked):
|
||||
"""将用户绑定到指定店铺(已存在则换绑)。返回 (changed, msg)。"""
|
||||
if dianpu_locked.zhuangtai != 1:
|
||||
return False, '邀请人店铺已被封禁'
|
||||
|
||||
try:
|
||||
existing = YonghuDianpuBangding.objects.select_for_update().get(yonghu=user_locked)
|
||||
if existing.dianpu_id == dianpu_locked.id:
|
||||
return False, '已绑定该店铺'
|
||||
old = existing.dianpu
|
||||
old.bangding_yonghushu = F('bangding_yonghushu') - 1
|
||||
old.save(update_fields=['bangding_yonghushu'])
|
||||
existing.dianpu = dianpu_locked
|
||||
existing.save(update_fields=['dianpu', 'UpdateTime'])
|
||||
except YonghuDianpuBangding.DoesNotExist:
|
||||
YonghuDianpuBangding.query.create(yonghu=user_locked, dianpu=dianpu_locked)
|
||||
|
||||
dianpu_locked.bangding_yonghushu = F('bangding_yonghushu') + 1
|
||||
dianpu_locked.save(update_fields=['bangding_yonghushu'])
|
||||
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)
|
||||
inviter_locked = User.objects.select_for_update().get(UserUUID=inviter_user.UserUUID)
|
||||
|
||||
inviter_binding = (
|
||||
YonghuDianpuBangding.objects.select_for_update()
|
||||
.filter(yonghu=inviter_locked)
|
||||
.select_related('dianpu')
|
||||
.first()
|
||||
)
|
||||
|
||||
if inviter_binding and inviter_binding.dianpu.zhuangtai == 1:
|
||||
dianpu_locked = Dianpu.objects.select_for_update().get(id=inviter_binding.dianpu_id)
|
||||
changed, msg = _bind_shop(invitee_locked, dianpu_locked)
|
||||
return {'shop_synced': True, 'dianpu_id': dianpu_locked.id, 'changed': changed, 'msg': msg}
|
||||
|
||||
old_id = _unbind_shop(invitee_locked)
|
||||
return {
|
||||
'shop_synced': False,
|
||||
'dianpu_id': None,
|
||||
'changed': bool(old_id),
|
||||
'msg': '邀请人未绑定店铺,已解除店铺绑定' if old_id else '邀请人未绑定店铺',
|
||||
}
|
||||
|
||||
|
||||
def bind_c_inviter_by_code(invitee_user, invite_code):
|
||||
"""
|
||||
用邀请码绑定/换绑邀请人,并同步店铺。
|
||||
返回 dict: code/msg/data
|
||||
"""
|
||||
code = (invite_code or '').strip()
|
||||
if not code:
|
||||
return {'code': 400, 'msg': '邀请码不能为空', 'data': None}
|
||||
if len(code) > 100:
|
||||
return {'code': 400, 'msg': '邀请码格式错误', 'data': None}
|
||||
|
||||
try:
|
||||
inviter_profile = YonghuCYaoqing.query.select_related('user').get(yaoqingma=code)
|
||||
except YonghuCYaoqing.DoesNotExist:
|
||||
return {'code': 404, 'msg': '邀请码无效', 'data': None}
|
||||
|
||||
inviter = inviter_profile.user
|
||||
if inviter.UserUID == invitee_user.UserUID:
|
||||
return {'code': 400, 'msg': '不能绑定自己为邀请人', 'data': None}
|
||||
|
||||
with transaction.atomic():
|
||||
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)
|
||||
|
||||
old_inviter_uid = (invitee_profile.yaoqingren or '').strip() or None
|
||||
new_inviter_uid = inviter.UserUID
|
||||
|
||||
if old_inviter_uid == new_inviter_uid:
|
||||
shop_info = sync_shop_from_inviter(invitee_user, inviter)
|
||||
return {
|
||||
'code': 200,
|
||||
'msg': '已绑定该邀请人',
|
||||
'data': {
|
||||
'yaoqingren': new_inviter_uid,
|
||||
'rebinding': False,
|
||||
'shop': shop_info,
|
||||
},
|
||||
}
|
||||
|
||||
# 换绑:旧邀请人计数 -1,新邀请人 +1
|
||||
if old_inviter_uid:
|
||||
old_p = (
|
||||
YonghuCYaoqing.objects.select_for_update()
|
||||
.filter(user__UserUID=old_inviter_uid)
|
||||
.first()
|
||||
)
|
||||
if old_p and old_p.yaogingshuliang > 0:
|
||||
old_p.yaogingshuliang = F('yaogingshuliang') - 1
|
||||
old_p.save(update_fields=['yaogingshuliang', 'UpdateTime'])
|
||||
|
||||
inviter_profile.yaogingshuliang = F('yaogingshuliang') + 1
|
||||
inviter_profile.save(update_fields=['yaogingshuliang', 'UpdateTime'])
|
||||
|
||||
invitee_profile.yaoqingren = new_inviter_uid
|
||||
invitee_profile.save(update_fields=['yaoqingren', 'UpdateTime'])
|
||||
|
||||
shop_info = sync_shop_from_inviter(invitee_user, inviter)
|
||||
|
||||
logger.info(
|
||||
'C端邀请绑定: 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 '已换绑邀请人',
|
||||
'data': {
|
||||
'yaoqingren': new_inviter_uid,
|
||||
'rebinding': bool(old_inviter_uid),
|
||||
'shop': shop_info,
|
||||
},
|
||||
}
|
||||
@@ -22,6 +22,7 @@ from .tixian_shenhe_views import TixianZddkshApplyView
|
||||
from .paihang_views import PhbHqsjView
|
||||
from .xzj_paihang_views import XzjPhbHqsjView
|
||||
from rank.reward_views import PhbJlXxView, PhbJlWdView, PhbJlLqView, PhbJlPhbView, PhbJlClubListView
|
||||
from .views.c_invite import CYaoqingmaView, CYaoqingBangdingView, CYaoqingListView, CYaoqingWodeView
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
@@ -38,6 +39,10 @@ urlpatterns = [
|
||||
path('shangjiagxnc', ShangjiaNichengGengxinView.as_view(), name='商家修改昵称'),
|
||||
path('bossbiaoshi', BossBiaoshiView.as_view(), name='获取老板标识'),
|
||||
path('yaoqingma', YaoqingmaView.as_view(), name='管事生成邀请码'),
|
||||
path('cyaoqingma', CYaoqingmaView.as_view(), name='点单端生成邀请码'),
|
||||
path('cyaoqingbd', CYaoqingBangdingView.as_view(), name='点单端绑定邀请人'),
|
||||
path('cwyqr', CYaoqingListView.as_view(), name='点单端我邀请的人'),
|
||||
path('cyqwd', CYaoqingWodeView.as_view(), name='点单端我的邀请摘要'),
|
||||
path('dashouzhuce',DashouZhuceView.as_view(), name='打手邀请码注册'),
|
||||
path('gshqyqds', GuanshiYaoqingDashouListView.as_view(), name='管事获取邀请打手'),
|
||||
path('tixianhq', TixianXinxiHuoquView.as_view(), name='获取体现缓存信息'), # 获取提现信息
|
||||
|
||||
168
users/views/c_invite.py
Normal file
168
users/views/c_invite.py
Normal file
@@ -0,0 +1,168 @@
|
||||
"""点单端 C 用户邀请相关接口。"""
|
||||
import logging
|
||||
|
||||
from django.core.paginator import Paginator, EmptyPage
|
||||
from django.db.models import Q
|
||||
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.views import APIView
|
||||
|
||||
from users.models import YonghuCYaoqing, UserBoss
|
||||
from users.business_models import User
|
||||
from users.services.c_invite import (
|
||||
ensure_c_invite_code,
|
||||
bind_c_inviter_by_code,
|
||||
get_or_create_c_yaoqing,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class CYaoqingmaView(APIView):
|
||||
"""获取或生成点单端邀请码。POST /yonghu/cyaoqingma"""
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def post(self, request):
|
||||
user = request.user
|
||||
if not getattr(user, 'UserUID', None):
|
||||
return Response({'code': 500, 'msg': '用户身份异常', 'data': None})
|
||||
try:
|
||||
profile, code, is_new = ensure_c_invite_code(user)
|
||||
return Response({
|
||||
'code': 200,
|
||||
'msg': '成功生成新邀请码' if is_new else '成功获取现有邀请码',
|
||||
'data': {
|
||||
'yaoqingma': code,
|
||||
'is_new': is_new,
|
||||
'yaogingshuliang': profile.yaogingshuliang or 0,
|
||||
'yaoqingren': profile.yaoqingren or '',
|
||||
},
|
||||
})
|
||||
except Exception as e:
|
||||
logger.exception('生成点单端邀请码失败: %s', e)
|
||||
return Response({'code': 500, 'msg': '邀请码生成失败', 'data': None})
|
||||
|
||||
|
||||
class CYaoqingBangdingView(APIView):
|
||||
"""绑定/换绑邀请人(并同步店铺)。POST /yonghu/cyaoqingbd"""
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def post(self, request):
|
||||
invite_code = request.data.get('inviteCode') or request.data.get('yaoqingma') or ''
|
||||
result = bind_c_inviter_by_code(request.user, invite_code)
|
||||
return Response({
|
||||
'code': result['code'],
|
||||
'msg': result['msg'],
|
||||
'data': result.get('data'),
|
||||
})
|
||||
|
||||
|
||||
class CYaoqingListView(APIView):
|
||||
"""我邀请的人列表。POST /yonghu/cwyqr"""
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def post(self, request):
|
||||
current_user = request.user
|
||||
try:
|
||||
page = int(request.data.get('page', 1))
|
||||
page_size = int(request.data.get('pageSize', 20))
|
||||
except (TypeError, ValueError):
|
||||
return Response({'code': 400, 'msg': '分页参数错误'})
|
||||
if page < 1 or page_size < 1:
|
||||
return Response({'code': 400, 'msg': '分页参数必须大于0'})
|
||||
page_size = min(page_size, 100)
|
||||
|
||||
keyword = (request.data.get('keyword') or '').strip()
|
||||
|
||||
base_qs = YonghuCYaoqing.query.select_related('user').filter(
|
||||
yaoqingren=current_user.UserUID
|
||||
)
|
||||
|
||||
total_all = base_qs.count()
|
||||
try:
|
||||
my_profile = current_user.CYaoqingProfile
|
||||
yaoqingzongshu = my_profile.yaogingshuliang
|
||||
except YonghuCYaoqing.DoesNotExist:
|
||||
yaoqingzongshu = total_all
|
||||
|
||||
if keyword:
|
||||
uid_matched = User.query.filter(UserUID__icontains=keyword).values_list('UserUUID', flat=True)
|
||||
boss_matched = UserBoss.query.filter(nickname__icontains=keyword).values_list('user_id', flat=True)
|
||||
base_qs = base_qs.filter(Q(user_id__in=uid_matched) | Q(user_id__in=boss_matched))
|
||||
|
||||
base_qs = base_qs.order_by('-CreateTime')
|
||||
paginator = Paginator(base_qs, page_size)
|
||||
try:
|
||||
page_obj = paginator.page(page)
|
||||
has_more = page_obj.has_next()
|
||||
filtered_total = paginator.count
|
||||
except EmptyPage:
|
||||
page_obj = []
|
||||
has_more = False
|
||||
filtered_total = paginator.count
|
||||
|
||||
# 批量取昵称
|
||||
user_uuids = [p.user_id for p in page_obj]
|
||||
nick_map = {}
|
||||
if user_uuids:
|
||||
for b in UserBoss.query.filter(user_id__in=user_uuids).only('user_id', 'nickname'):
|
||||
nick_map[b.user_id] = b.nickname or ''
|
||||
|
||||
rows = []
|
||||
for p in page_obj:
|
||||
u = p.user
|
||||
rows.append({
|
||||
'uid': u.UserUID,
|
||||
'nicheng': nick_map.get(p.user_id) or '微信用户',
|
||||
'touxiang': u.Avatar or '',
|
||||
'createTime': p.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if p.CreateTime else '',
|
||||
})
|
||||
|
||||
return Response({
|
||||
'code': 200,
|
||||
'msg': 'ok',
|
||||
'data': {
|
||||
'list': rows,
|
||||
'yaoqingzongshu': yaoqingzongshu,
|
||||
'totalCount': filtered_total,
|
||||
'currentPage': page,
|
||||
'pageSize': page_size,
|
||||
'hasMore': has_more,
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
class CYaoqingWodeView(APIView):
|
||||
"""当前用户邀请关系摘要。POST /yonghu/cyqwd"""
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def post(self, request):
|
||||
profile = get_or_create_c_yaoqing(request.user)
|
||||
inviter_info = None
|
||||
if profile.yaoqingren:
|
||||
try:
|
||||
inviter = User.query.get(UserUID=profile.yaoqingren)
|
||||
nicheng = '微信用户'
|
||||
try:
|
||||
nicheng = inviter.BossProfile.nickname or nicheng
|
||||
except Exception:
|
||||
pass
|
||||
inviter_info = {
|
||||
'uid': inviter.UserUID,
|
||||
'nicheng': nicheng,
|
||||
'touxiang': inviter.Avatar or '',
|
||||
}
|
||||
except User.DoesNotExist:
|
||||
inviter_info = {'uid': profile.yaoqingren, 'nicheng': '未知', 'touxiang': ''}
|
||||
|
||||
return Response({
|
||||
'code': 200,
|
||||
'msg': 'ok',
|
||||
'data': {
|
||||
'yaoqingma': profile.yaoqingma or '',
|
||||
'yaogingshuliang': profile.yaogingshuliang or 0,
|
||||
'yaoqingren': profile.yaoqingren or '',
|
||||
'inviter': inviter_info,
|
||||
},
|
||||
})
|
||||
Reference in New Issue
Block a user