优化斗鱼充值日志与配置

web/backend/services/douyu_runner.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import re
 import threading
 import time
 from decimal import Decimal
@@ -760,6 +761,15 @@ class DouyuBatchRunner:
         }
         return result
 
+    @staticmethod
+    def _supplier_out_order_id(task: DouyuTask) -> str:
+        """生成可追踪的供应商外部订单号；已有订单号必须在重试时复用。"""
+        existing = str(task.supplier_out_order_id or "").strip()
+        if existing:
+            return existing
+        batch_token = re.sub(r"[^A-Za-z0-9]", "", str(task.batch_id or "")).upper()[:16] or "LOCAL"
+        return f"DYGF{batch_token}T{task.id}"
+
     def _wait_supplier_gold_order(
         self,
         db: Session,
@@ -2456,7 +2466,7 @@ class DouyuBatchRunner:
         channel = str(config.get("gold_recharge_channel") or "wechat_qr")
         if channel == "supplier_api":
             try:
-                self._execute_create_gold_supplier_order(db, task, account, config, amount)
+                self._execute_create_gold_supplier_order(db, task, account, cookie, config, amount)
             except FishFinRechargeError as exc:
                 self._mark_task(db, task, "failed", str(exc), {"recharge_channel": "supplier_api"})
             return
@@ -2500,24 +2510,28 @@ class DouyuBatchRunner:
         db: Session,
         task: DouyuTask,
         account: Account,
+        cookie: str,
         config: dict,
         amount: int,
     ) -> None:
         """创建供应商鱼翅直充订单并轮询订单状态。"""
         product_id = str(config.get("gold_api_product_id") or "").strip()
-        template_name = str(config.get("gold_api_account_template_name") or "斗鱼UID").strip()
+        template_name = str(config.get("gold_api_account_template_name") or "斗鱼昵称").strip()
         if not product_id:
             raise FishFinRechargeError("请先在配置中填写供应商直充商品 ID")
-        charge_account = str(account.uid or "").strip()
-        if not charge_account:
-            raise FishFinRechargeError("账号缺少斗鱼 UID，无法发起供应商直充")
+        # 充值商品按斗鱼昵称识别账号，UID 只能作为审计信息，不能作为充值值。
+        update_account_profile_from_cookie(account, cookie)
+        recharge_account = str(account.nickname or "").strip()
+        if not recharge_account:
+            raise FishFinRechargeError("账号缺少斗鱼昵称，无法发起供应商直充")
 
-        # task.id 是唯一且稳定的外部订单号来源，重试时不会创建不同的供应商订单。
-        order_no = f"DYGF{task.id}"
+        # 首次生成后持久化，网络重试或进程重启都继续查询同一笔订单。
+        order_no = self._supplier_out_order_id(task)
         task.supplier_out_order_id = order_no
         db.commit()
         # pay_amount 是用户选择的充值面值；goodsFaceValue=0.993 是供货成本，不能作为支付金额。
         pay_amount = Decimal(amount)
+
         def trace(event: dict) -> None:
             """将脱敏供应商协议信息输出到任务日志，便于线上联调。"""
             stage = event.get("stage")
@@ -2525,36 +2539,41 @@ class DouyuBatchRunner:
                 params = event.get("params") or {}
                 self._push_log(
                     "info",
-                    "供应商直充请求 "
-                    f"path={event.get('path')} out_order_id={params.get('out_order_id')} "
-                    f"buy_num={params.get('buy_num')} pay_amount={params.get('pay_amount')} "
-                    f"product_id={params.get('product_id')} types={event.get('parameter_types')} "
-                    f"sign_digest={event.get('sign_digest')}",
+                    "供应商直充 | 下单 "
+                    f"| 外部单号={params.get('out_order_id') or '-'} "
+                    f"| 数量={params.get('buy_num') or '-'} "
+                    f"| 金额={params.get('pay_amount') or '-'} "
+                    f"| 商品={params.get('product_id') or '-'}",
                 )
                 if event.get("json_body"):
                     self._push_log(
-                        "info",
-                        "供应商直充完整调试请求 "
-                        f"url={event.get('url')} content_type={event.get('content_type')} "
-                        f"body={FishFinRechargeClient._json_text(event['json_body'])} "
-                        f"sign_params={FishFinRechargeClient._json_text(event.get('sign_params') or {})} "
-                        f"sign_source={event.get('sign_source')}",
+                        "debug",
+                        "供应商协议 | 请求 "
+                        f"| {event.get('method')} {event.get('path')} "
+                        f"| 签名摘要={event.get('sign_digest')} "
+                        f"| 参数={FishFinRechargeClient._json_text(event['json_body'])}",
                     )
             elif stage == "response":
+                status = self._to_int(event.get("order_status"))
+                status_labels = {0: "待处理", 1: "处理中", 2: "成功", 3: "失败", 4: "异常"}
+                status_text = status_labels.get(status, "-")
+                reason = str(event.get("fail_reason") or event.get("message") or "-")
                 self._push_log(
                     "info",
-                    "供应商直充响应 "
-                    f"http={event.get('http_status')} code={event.get('code')} "
-                    f"message={event.get('message') or '-'} keys={event.get('keys')} "
-                    f"data_keys={event.get('data_keys')} result_keys={event.get('result_keys')}",
+                    "供应商直充 | 响应 "
+                    f"| HTTP={event.get('http_status') or '-'} "
+                    f"| 业务码={event.get('code') or '-'} "
+                    f"| 外部单号={event.get('out_order_id') or '-'} "
+                    f"| 供应商单号={event.get('order_id') or '-'} "
+                    f"| 状态={status_text} "
+                    f"| 提示={reason}",
                 )
                 if event.get("response_body"):
                     self._push_log(
-                        "info",
-                        "供应商直充完整调试响应 "
-                        f"headers={FishFinRechargeClient._json_text(event.get('response_headers') or {})} "
-                        f"body={FishFinRechargeClient._json_text(event['response_body'])} "
-                        f"raw={event.get('response_text')}",
+                        "debug",
+                        "供应商协议 | 响应 "
+                        f"| HTTP={event.get('http_status')} "
+                        f"| 内容={FishFinRechargeClient._json_text(event['response_body'])}",
                     )
 
         client = FishFinRechargeClient(FishFinRechargeConfig.from_env(), trace=trace)
@@ -2563,7 +2582,7 @@ class DouyuBatchRunner:
             pay_amount=pay_amount,
             out_order_id=order_no,
             product_id=product_id,
-            recharge_arg=[{"templateName": template_name, "templateVal": charge_account}],
+            recharge_arg=[{"templateName": template_name, "templateVal": recharge_account}],
             order_type=0,
             notify_url=client.config.notify_url,
         )
@@ -2573,7 +2592,8 @@ class DouyuBatchRunner:
             "recharge_channel": "supplier_api",
             "out_order_id": order_no,
             "order_id": self._supplier_value(order_payload, "order_id", "orderId"),
-            "charge_account": charge_account,
+            "recharge_account": recharge_account,
+            "douyu_uid": str(account.uid or "").strip(),
             "buy_num": amount,
             "product_id": product_id,
             "pay_amount": format(pay_amount.normalize(), "f"),