完善多店铺开启多窗口、外观进度条等

app/amazon/main.py

@@ -1,7 +1,8 @@
-import time
-import traceback
-import requests
-from datetime import datetime
+import time
+import traceback
+import requests
+import threading
+from datetime import datetime
 from typing import Dict, Any, List
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from config import JSON_TASK_QUEUE, runing_task, runing_shop, DELETE_BRAND_API_BASE, ZN_COMPANY, ZN_USERNAME, ZN_PASSWORD
@@ -31,7 +32,10 @@ class TaskMonitor:
         
         self.chunk_index = 1  # 当前处理的分块索引
         self.max_workers = 5  # 线程池最大线程数
-        self.executor = None  # 线程池执行器
+        self.executor = None  # 线程池执行器
+        self.serial_task_locks = {
+            "product-risk-resolve-run": threading.Lock(),
+        }
 
         # 在提交新任务前杀掉旧进程（确保环境干净）
         kill_process("v6")
@@ -118,7 +122,17 @@ class TaskMonitor:
         except Exception as e:
             self.log(f"线程 {id(task_data)} 删除品牌任务处理异常: {traceback.format_exc()}", "ERROR")
     
-    def _process_approve_task_wrapper(self, task_data: Dict[str, Any],TASK_TYPE:str):
+    def _process_approve_task_wrapper(self, task_data: Dict[str, Any],TASK_TYPE:str):
+        task_type = task_data.get("type", "")
+        task_lock = self.serial_task_locks.get(task_type)
+        if task_lock is not None:
+            self.log(f"线程 {id(task_data)} 等待 {task_type} 串行锁...")
+            with task_lock:
+                self.log(f"线程 {id(task_data)} 获取 {task_type} 串行锁，开始处理...")
+                return self._process_approve_task_unlocked(task_data, TASK_TYPE)
+        return self._process_approve_task_unlocked(task_data, TASK_TYPE)
+
+    def _process_approve_task_unlocked(self, task_data: Dict[str, Any],TASK_TYPE:str):
         """审批任务处理包装器（用于线程池调用）
         
         Args: