diff --git a/shop/services/__init__.py b/shop/services/__init__.py new file mode 100644 index 0000000..46023b3 --- /dev/null +++ b/shop/services/__init__.py @@ -0,0 +1 @@ +# shop.services diff --git a/shop/services/shop_binding.py b/shop/services/shop_binding.py new file mode 100644 index 0000000..bdc524a --- /dev/null +++ b/shop/services/shop_binding.py @@ -0,0 +1,95 @@ +"""用户店铺绑定：一人只能绑定一家店（业务约定）。""" +from django.db import transaction +from django.db.models import F + +from shop.models import Dianpu, YonghuDianpuBangding + +import logging + +logger = logging.getLogger(__name__) + + +def get_latest_binding_qs(yonghu): + """同一用户可能历史残留多条绑定，一律取最近更新的一条。""" + return ( + YonghuDianpuBangding.objects + .filter(yonghu=yonghu) + .select_related('dianpu') + .order_by('-UpdateTime', '-id') + ) + + +def get_user_shop_binding(yonghu): + """读取当前生效绑定（最新一条）。""" + return get_latest_binding_qs(yonghu).first() + + +def _delete_extra_bindings(yonghu, keep_id=None): + """ + 删除同一用户多余绑定行，并扣减对应店铺绑定数。 + keep_id: 保留的绑定主键；None 表示全部删除。 + """ + qs = YonghuDianpuBangding.objects.select_for_update().filter(yonghu=yonghu) + if keep_id is not None: + qs = qs.exclude(pk=keep_id) + extras = list(qs.select_related('dianpu')) + for row in extras: + try: + dianpu = row.dianpu + dianpu.bangding_yonghushu = F('bangding_yonghushu') - 1 + dianpu.save(update_fields=['bangding_yonghushu']) + except Exception: + logger.warning('扣减多余绑定店铺人数失败 binding=%s', row.pk, exc_info=True) + row.delete() + return len(extras) + + +@transaction.atomic +def set_user_shop_binding(yonghu, dianpu): + """ + 将用户唯一绑定到 dianpu；清理多余行。 + 返回 (changed: bool, msg: str) + """ + yonghu_locked = type(yonghu).objects.select_for_update().get(pk=yonghu.pk) + dianpu_locked = Dianpu.objects.select_for_update().get(pk=dianpu.pk) + + if dianpu_locked.zhuangtai != 1: + return False, '店铺已被封禁，无法绑定' + + rows = list( + YonghuDianpuBangding.objects.select_for_update() + .filter(yonghu=yonghu_locked) + .select_related('dianpu') + .order_by('-UpdateTime', '-id') + ) + + if rows: + primary = rows[0] + if primary.dianpu_id == dianpu_locked.id: + # 已是目标店：清掉多余行即可 + _delete_extra_bindings(yonghu_locked, keep_id=primary.pk) + return False, '已绑定该店铺' + + old = primary.dianpu + old.bangding_yonghushu = F('bangding_yonghushu') - 1 + old.save(update_fields=['bangding_yonghushu']) + + primary.dianpu = dianpu_locked + primary.save(update_fields=['dianpu', 'UpdateTime']) + _delete_extra_bindings(yonghu_locked, keep_id=primary.pk) + else: + primary = YonghuDianpuBangding.query.create(yonghu=yonghu_locked, dianpu=dianpu_locked) + + dianpu_locked.bangding_yonghushu = F('bangding_yonghushu') + 1 + dianpu_locked.save(update_fields=['bangding_yonghushu']) + return True, '绑定成功' + + +@transaction.atomic +def clear_user_shop_binding(yonghu): + """解除用户全部店铺绑定。返回被解除的主店铺 id 或 None。""" + yonghu_locked = type(yonghu).objects.select_for_update().get(pk=yonghu.pk) + primary = get_latest_binding_qs(yonghu_locked).first() + old_id = primary.dianpu_id if primary else None + _delete_extra_bindings(yonghu_locked, keep_id=None) + return old_id diff --git a/shop/views/shop_base_views.py b/shop/views/shop_base_views.py index 24f01f7..a693db3 100644 --- a/shop/views/shop_base_views.py +++ b/shop/views/shop_base_views.py @@ -90,42 +90,11 @@ class BindDianpuView(APIView): if dianpu.zhuangtai != 1: return Response({'code': 200, 'msg': '店铺已被封禁，无法绑定'}) - # 在事务内部进行加锁操作 try: - with transaction.atomic(): - # 重新获取加锁的用户对象（确保并发安全） - user_main_locked = User.objects.select_for_update().get(UserUID=user.UserUID) - dianpu_locked = Dianpu.objects.select_for_update().get(id=dianpu_id) - - # 再次校验店铺状态（防止事务期间被修改） - if dianpu_locked.zhuangtai != 1: - return Response({'code': 200, 'msg': '店铺已被封禁，无法绑定'}) - - # 处理绑定关系 - try: - existing_binding = YonghuDianpuBangding.objects.select_for_update().get(yonghu=user_main_locked) - old_dianpu = existing_binding.dianpu - if old_dianpu.id == dianpu_locked.id: - return Response({'code': 200, 'msg': '已绑定该店铺'}) - - # 旧店铺绑定人数减1 - old_dianpu.bangding_yonghushu = F('bangding_yonghushu') - 1 - old_dianpu.save(update_fields=['bangding_yonghushu']) - - # 更新绑定关系 - existing_binding.dianpu = dianpu_locked - existing_binding.save() - - except YonghuDianpuBangding.DoesNotExist: - YonghuDianpuBangding.query.create(yonghu=user_main_locked, dianpu=dianpu_locked) - - # 新店铺绑定人数加1 - dianpu_locked.bangding_yonghushu = F('bangding_yonghushu') + 1 - dianpu_locked.save(update_fields=['bangding_yonghushu']) - - logger.info(f"用户 {user.UserUID} 绑定店铺 {dianpu_id} 成功") - return Response({'code': 200, 'msg': '绑定成功'}) - + from shop.services.shop_binding import set_user_shop_binding + changed, msg = set_user_shop_binding(user_main, dianpu) + logger.info(f"用户 {user.UserUID} 绑定店铺 {dianpu_id}: changed={changed} msg={msg}") + return Response({'code': 200, 'msg': msg if changed else '已绑定该店铺'}) except Exception as e: logger.exception(f"绑定店铺失败: {e}") return Response({'code': 500, 'msg': '绑定失败，服务器内部错误'}) @@ -150,11 +119,9 @@ class ShopGoodsView(APIView): except User.DoesNotExist: return Response({'code': 404, 'msg': '用户不存在'}) - # 1. 查询用户店铺绑定关系 - binding = YonghuDianpuBangding.query.filter( - yonghu=user_main - ).select_related('dianpu').first() - + # 1. 查询用户店铺绑定关系（一人多条历史脏数据时取最新） + from shop.services.shop_binding import get_user_shop_binding + binding = get_user_shop_binding(user_main) # 2. 判断用户是否拥有特殊身份 has_special = self._has_special_identity(user_main) diff --git a/users/services/c_invite.py b/users/services/c_invite.py index f804e1d..076837a 100644 --- a/users/services/c_invite.py +++ b/users/services/c_invite.py @@ -2,7 +2,12 @@ from django.db import transaction from django.db.models import F -from shop.models import Dianpu, YonghuDianpuBangding +from shop.models import Dianpu +from shop.services.shop_binding import ( + clear_user_shop_binding, + get_user_shop_binding, + set_user_shop_binding, +) from users.models import YonghuCYaoqing from users.business_models import User @@ -17,68 +22,21 @@ def get_or_create_c_yaoqing(user): return profile -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() - ) + inviter_binding = get_user_shop_binding(inviter_user) 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} + dianpu = Dianpu.objects.select_for_update().get(id=inviter_binding.dianpu_id) + changed, msg = set_user_shop_binding(invitee_user, dianpu) + return {'shop_synced': True, 'dianpu_id': dianpu.id, 'changed': changed, 'msg': msg} - old_id = _unbind_shop(invitee_locked) + old_id = clear_user_shop_binding(invitee_user) return { 'shop_synced': False, 'dianpu_id': None, @@ -107,7 +65,6 @@ def bind_c_inviter_by_uid(invitee_user, inviter_uid): 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)