完成虎牙宝典WSS绑定与快照隔离重构

web/backend/services/huya_runner_bind.py

@@ -8,8 +8,6 @@ from typing import TYPE_CHECKING, Any
 
 from sqlalchemy.orm import Session
 
-from core.huya import HuyaHttpClient
-
 from ..models import HuyaAccount, HuyaTask
 
 HUYA_BIND_ROLE_POLL_SECONDS = 180
@@ -18,6 +16,9 @@ HUYA_BIND_ZT_UUID = "b02faae1"
 HUYA_BIND_ROOM_ID = "30596253"
 from .huya_runner_core import HUYA_RECHARGE_SOURCE_ID, HuyaBatchRunnerCore
 
+if TYPE_CHECKING:
+    from core.huya import HuyaHttpClient
+
 
 class BindMixin:
     """游戏角色绑定域：绑定状态机、扫码/确认绑定。"""
@@ -36,6 +37,7 @@ class BindMixin:
         def _push_log(self, level: str, message: str) -> None: ...
         def _mark_task(self, *args: Any, **kwargs: Any) -> None: ...
         def _update_task_progress(self, *args: Any, **kwargs: Any) -> None: ...
+        def _activity_client(self, uid: int, cookie: str): ...
 
     @staticmethod
     def _role_name(bind_status) -> str:
@@ -315,9 +317,7 @@ class BindMixin:
             self._mark_task(worker_db, task, "failed", "账号 Cookie 为空")
             return
 
-        client: Any = HuyaHttpClient(
-            logger=lambda msg: self._push_log("info", f"[{uid}] {msg}")
-        )
+        client: Any = self._activity_client(uid, cookie)
         bind_status, bind_query_result = self._resolve_bind_status(
             client=client,
             uid=uid,
@@ -503,9 +503,7 @@ class BindMixin:
             self._mark_task(worker_db, task, "failed", "账号 Cookie 为空")
             return
 
-        client: Any = HuyaHttpClient(
-            logger=lambda msg: self._push_log("info", f"[{uid}] {msg}")
-        )
+        client: Any = self._activity_client(uid, cookie)
         bind_status, bind_query_result = self._resolve_bind_status(
             client=client,
             uid=uid,
@@ -577,9 +575,7 @@ class BindMixin:
             self._mark_task(worker_db, task, "failed", "账号 Cookie 为空")
             return
 
-        client: Any = HuyaHttpClient(
-            logger=lambda msg: self._push_log("info", f"[{uid}] {msg}")
-        )
+        client: Any = self._activity_client(uid, cookie)
         role_status, role_query_result = self._resolve_bind_status(
             client=client,
             uid=uid,

web/backend/services/huya_runner_goods.py

@@ -245,10 +245,15 @@ class GoodsMixin:
             if item.get("product_id") and item.get("name")
         ]
         now = datetime.now(UTC)
-        worker_db.query(HuyaGoodsSnapshot).delete(synchronize_session=False)
+        worker_db.query(HuyaGoodsSnapshot).filter(
+            HuyaGoodsSnapshot.account_id == account.id,
+            HuyaGoodsSnapshot.sid == sid_int,
+        ).delete(synchronize_session=False)
         for item in goods:
             worker_db.add(
                 HuyaGoodsSnapshot(
+                    account_id=account.id,
+                    sid=sid_int,
                     product_id=item["product_id"],
                     name=item["name"],
                     price=item["price"],
@@ -298,7 +303,11 @@ class GoodsMixin:
 
         snapshot = (
             worker_db.query(HuyaGoodsSnapshot)
-            .filter(HuyaGoodsSnapshot.product_id == str(product_id))
+            .filter(
+                HuyaGoodsSnapshot.account_id == account.id,
+                HuyaGoodsSnapshot.sid == sid_int,
+                HuyaGoodsSnapshot.product_id == str(product_id),
+            )
             .first()
         )
         product_name = str(

web/backend/services/huya_runner_recharge.py

@@ -310,10 +310,15 @@ class RechargeMixin:
             }
             goods.append(item)
 
-        worker_db.query(HuyaRechargeGoodsSnapshot).delete(synchronize_session=False)
+        worker_db.query(HuyaRechargeGoodsSnapshot).filter(
+            HuyaRechargeGoodsSnapshot.account_id == account.id,
+            HuyaRechargeGoodsSnapshot.sid == (self._to_int(config_info.get("sid")) or 2203),
+        ).delete(synchronize_session=False)
         for item in goods:
             worker_db.add(
                 HuyaRechargeGoodsSnapshot(
+                    account_id=account.id,
+                    sid=self._to_int(config_info.get("sid")) or 2203,
                     spu_id=item["spu_id"],
                     sku_id=item["sku_id"],
                     name=item["name"],
@@ -382,7 +387,11 @@ class RechargeMixin:
 
         snapshot = (
             worker_db.query(HuyaRechargeGoodsSnapshot)
-            .filter(HuyaRechargeGoodsSnapshot.spu_id == spu_id)
+            .filter(
+                HuyaRechargeGoodsSnapshot.account_id == account.id,
+                HuyaRechargeGoodsSnapshot.sid == (self._to_int(config_info.get("sid")) or 2203),
+                HuyaRechargeGoodsSnapshot.spu_id == spu_id,
+            )
             .first()
         )
         payload_sku_id = self._to_int(self.payload.get("sku_id"))