From 6f139b3afa302e5c4033fa207e435d690b325de7 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Tue, 23 Dec 2025 16:11:11 +0800
Subject: [PATCH] fix: ensure uid unique without null

---
 zhenxun/models/user_console.py | 59 ++++++++++++----------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/zhenxun/models/user_console.py b/zhenxun/models/user_console.py
index fbc9088b..56dc3095 100644
--- a/zhenxun/models/user_console.py
+++ b/zhenxun/models/user_console.py
@@ -15,7 +15,7 @@ class UserConsole(Model):
     """自增id"""
     user_id = fields.CharField(255, unique=True, description="用户id")
     """用户id"""
-    uid = fields.IntField(description="UID", unique=True, null=True)
+    uid = fields.IntField(description="UID", unique=True)
     """UID"""
     gold = fields.IntField(default=100, description="金币数量")
     """金币数量"""
@@ -44,17 +44,22 @@ class UserConsole(Model):
             return user
 
         try:
-            user, created = await cls.get_or_create(
-                user_id=user_id,
-                defaults={
-                    "platform": platform,
-                    "uid": None,
-                },
-            )
-            if created:
-                user.uid = await cls.get_new_uid()
-                await user.save(update_fields=["uid"])
-            return user
+            # 先生成一个当前看起来不会冲突的 uid，再创建用户
+            # 如果并发下仍然发生冲突，捕获后重试 / 回退到查询
+            for _ in range(3):
+                uid = await cls.get_new_uid()
+                try:
+                    return await cls.create(
+                        user_id=user_id,
+                        platform=platform,
+                        uid=uid,
+                    )
+                except IntegrityError:
+                    # 可能是 uid 或 user_id 的唯一约束竞争，重试几次
+                    continue
+            # 如果多次重试仍失败，很可能是其它协程/进程已经成功创建
+            # 直接按 user_id 再查一遍
+            return await cls.get(user_id=user_id)
         except IntegrityError:
             return await cls.get(user_id=user_id)
 
@@ -90,12 +95,7 @@ class UserConsole(Model):
             source: 来源
             platform: 平台.
         """
-        user, created = await cls.get_or_create(
-            user_id=user_id,
-            defaults={"platform": platform, "uid": None},
-        )
-        if created:
-            user.uid = await cls.get_new_uid()
+        user = await cls.get_user(user_id=user_id, platform=platform)
         user.gold += gold
         await user.save(update_fields=["gold", "uid"])
         await UserGoldLog.create(
@@ -123,12 +123,7 @@ class UserConsole(Model):
         异常:
             InsufficientGold: 金币不足
         """
-        user, created = await cls.get_or_create(
-            user_id=user_id,
-            defaults={"platform": platform, "uid": None},
-        )
-        if created:
-            user.uid = await cls.get_new_uid()
+        user = await cls.get_user(user_id=user_id, platform=platform)
         if user.gold < gold:
             raise InsufficientGold()
         user.gold -= gold
@@ -149,12 +144,7 @@ class UserConsole(Model):
             num: 道具数量.
             platform: 平台.
         """
-        user, created = await cls.get_or_create(
-            user_id=user_id,
-            defaults={"platform": platform, "uid": None},
-        )
-        if created:
-            user.uid = await cls.get_new_uid()
+        user = await cls.get_user(user_id=user_id, platform=platform)
         if goods_uuid not in user.props:
             user.props[goods_uuid] = 0
         user.props[goods_uuid] += num
@@ -188,16 +178,9 @@ class UserConsole(Model):
             num: 道具数量.
             platform: 平台.
         """
-        user, created = await cls.get_or_create(
-            user_id=user_id,
-            defaults={"platform": platform, "uid": None},
-        )
-        if created:
-            user.uid = await cls.get_new_uid()
+        user = await cls.get_user(user_id=user_id, platform=platform)
 
         if goods_uuid not in user.props or user.props[goods_uuid] < num:
-            if created:
-                await user.save(update_fields=["uid"])
             raise GoodsNotFound("未找到商品或道具数量不足...")
         user.props[goods_uuid] -= num
         if user.props[goods_uuid] <= 0: