modified: app/amazon/__pycache__/approve.cpython-39.pyc

modified:   app/amazon/__pycache__/del_brand.cpython-39.pyc
	modified:   app/amazon/__pycache__/main.cpython-39.pyc
	modified:   app/amazon/__pycache__/match_action.cpython-39.pyc
	modified:   app/amazon/__pycache__/tool.cpython-39.pyc
	modified:   app/amazon/approve.py
	modified:   app/amazon/del_brand.py
	modified:   app/amazon/main.py
	modified:   app/amazon/match_action.py
	modified:   app/amazon/tool.py
	modified:   app/assets/delete-brand.js
	modified:   app/new_web_source/delete-brand.html

app/amazon/match_action.py

@@ -7,7 +7,7 @@ from config import runing_task, runing_shop
 from datetime import datetime
 from amazon.del_brand import AmamzonBase, kill_process
 
-from amazon.tool import show_notification
+from amazon.tool import show_notification,get_shop_info
 
 
 class AmzoneMatchAction(AmamzonBase):
@@ -273,6 +273,8 @@ class MatchTak:
                 
                 try:
                     self.process_shop(shop_item, country_codes, task_id, risk_listing_filter, user_id, stage_index, final_stage)
+
+                    # self.process_shop(shop_item, country_codes, task_id,risk_listing_filter)
                     # 更新已处理店铺数
                     if task_id in runing_task:
                         runing_task[task_id]["processed_shops"] += 1
@@ -299,6 +301,7 @@ class MatchTak:
                     runing_task[task_id]["status"] = "failed"
                     runing_task[task_id]["error"] = str(e)
     
+    # def process_shop(self, shop_item: dict, country_codes: list, task_id: int, risk_listing_filter: str):
     def process_shop(self, shop_item: dict, country_codes: list, task_id: int, risk_listing_filter: str, user_id=None, stage_index=None, final_stage: bool = True):
         """处理单个店铺
         
@@ -350,16 +353,27 @@ class MatchTak:
                 
                 if browser and browser != "店铺不存在":
                     self.log(f"成功打开店铺 {shop_name}")
-                    break
                 else:
                     self.log(f"打开店铺失败: {browser}", "WARNING")
                     driver = None
+                    continue
 
                 # 判断是否需要登录
                 need_login = driver.need_login()
+                print("【是否需要登录】：",need_login)
                 if need_login:
                     self.log(f"店铺 {shop_name} 需要登录，正在登录...")
-                    password = ""
+                    # 获取店铺凭证
+                    response = get_shop_info(shop_name)
+                    print("【获取店铺凭证返回】：",response.text)
+                    shop_data = response.json()
+                    if not shop_data:
+                        mes = f"获取店铺凭证失败，响应数据: {shop_data.get('message', '未知错误')}"
+                        self.log(mes, "ERROR")
+                        show_notification(mes, "ERROR")
+                        continue
+                    
+                    password = shop_data["data"]["password"]
 
                     login_success = driver.login(password)
                     if login_success:
@@ -374,6 +388,8 @@ class MatchTak:
                     else:
                         self.log(f"店铺 {shop_name} 登录失败", "WARNING")
                         driver = None
+                else:
+                    break
 
             except Exception as e:
                 import traceback
@@ -409,7 +425,9 @@ class MatchTak:
                     import traceback
                     self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR")
                     self.log(traceback.format_exc(), "ERROR")
+            # 最后回传，标记完成
             try:
+                # self.post_result(task_id, shop_name, country_code, "", "", is_done=True)
                 if final_stage:
                     self.post_result(task_id, shop_name, country_code, "", "", is_done=True)
                 else:
@@ -564,7 +582,6 @@ class MatchTak:
             runing_task[task_id]["processed_countries"] += 1
         
         self.log(f"国家 {country_name} 处理完成")
-    
     def post_stage_finished(self, task_id: int, user_id, stage_index):
         import requests
         from config import DELETE_BRAND_API_BASE
@@ -639,8 +656,8 @@ class MatchTak:
         max_retries = 3
         for retry in range(max_retries):
             try:
-                print("================回传处理结果====================")
-                self.log(f"尝试回传结果 (第{retry + 1}/{max_retries} 次)")
+                print("================【匹配】=====================")
+                self.log(f"尝试回传结果 (第 {retry + 1}/{max_retries} 次)")
                 self.log(f"回传URL: {url}")
                 self.log(f"回传数据: {payload}")
                 response = requests.post(
@@ -653,9 +670,10 @@ class MatchTak:
                 self.log(f"回传结果: {response.text}")
                 data = response.json() if response.text else {}
                 if response.status_code == 200 and isinstance(data, dict) and data.get("success"):
-                    self.log(f"回传结果成功: {asin} - {status}")
+                    self.log(f"结果回传成功: {asin} - {status}")
                     return
-                self.log(f"回传结果失败，状态码: {response.status_code}", "WARNING")
+                else:
+                    self.log(f"结果回传失败，状态码: {response.status_code}", "WARNING")
                 print("=====================================")
                     
             except Exception as e:
@@ -666,7 +684,10 @@ class MatchTak:
             if retry < max_retries - 1:
                 time.sleep(2)
         
+        self.log(f"已达到最大重试次数，结果回传最终失败", "ERROR")
         raise RuntimeError("已达到最大重试次数，结果回传最终失败")
+        
+
 
 if __name__ == "__main__":
     user_info = {