Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin

app/amazon/approve.py

@@ -0,0 +1,821 @@
+import time
+import re
+import traceback
+from DrissionPage._pages.chromium_tab import ChromiumTab
+
+from config import runing_task, runing_shop
+from datetime import datetime
+from amazon.del_brand import AmamzonBase, kill_process
+
+class AmzoneApprove(AmamzonBase):
+
+    def SwitchPage(self):
+        """
+        切换至 管理所有库存页面
+        1、等待 //navigation-favorites-bar[@class="hydrated"] 出现
+        """
+        navigation = self.tab.ele('xpath://navigation-favorites-bar[@class="hydrated"]')
+        navigation.wait.displayed(raise_err=False)
+        page_btn = navigation.sr('xpath://internal-fav-bar-links[@data-internal="navigation"]').sr(
+            'xpath://a[@data-page-id="ezdpc-gui-inventory-mons"]')
+        page_btn.wait.displayed(raise_err=False)
+        page_btn.click(timeout=5)
+
+        self.tab.wait.doc_loaded()
+        # 等待搜索框出现
+        search_region = self.tab.ele('xpath://div[@id="searchBoxContainer"]//kat-input-group')
+        search_region.wait.displayed(raise_err=False)
+
+
+    def search(self,filter_type="ApprovalRequired"):
+        sku_ls = []
+
+        load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5)
+        if len(load_ele) > 0:
+            load_ele[0].wait.deleted(timeout=3, raise_err=False)
+        time.sleep(0.5)
+
+        drop_down = self.tab.ele('xpath://div[contains(@class,"VolusListingStatusDropDown-module__verticalContainer")]//kat-dropdown')
+        drop_down.wait.displayed(raise_err=False)
+        drop_down.wait.enabled(raise_err=False)
+        time.sleep(0.6)
+        drop_down.click()
+        # //kat-option[@value="SearchSuppressed"]
+        xp = f'xpath://kat-option[@value="{filter_type}"]'
+        print(f"正在寻找筛选条件 {filter_type}，xpath: {xp}")
+        approval_required = self.tab.eles(xp,timeout=5)
+        if len(approval_required) == 0:
+            print(f"【没有需要{filter_type}选项】没有需要{filter_type}的商品了")
+            return sku_ls  # "没有需要审批的商品了"
+        else:
+            approval_required = approval_required[0]
+        approval_required.wait.displayed(raise_err=False)
+        approval_required.click()
+
+        approval_required_text = approval_required.text
+        print(f"已选择筛选条件: {approval_required_text}")
+
+        count = re.findall(r'\d+', approval_required_text)
+        if count:
+            count = int(count[0])
+            print(f"待审批的商品数量: {count}")
+            if count <= 0:
+                print(f"没有需要{filter_type}的商品了")
+                return sku_ls #"没有需要审批的商品了"
+        for _ in range(3):
+            # 等待加载完成
+            load_ele = self.tab.ele("xpath://div[contains(@class,'Loader-module__loader')]")
+            load_ele.wait.deleted(timeout=3, raise_err=False)
+            time.sleep(0.5)
+
+            sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=3)
+            if len(sku_ls) > 0:
+                break
+            approval_required.click()
+        return sku_ls
+
+    def wait_loaded(self):
+        # 等待加载完成
+        try:
+            load_ele = self.tab.ele(
+                'xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[contains(@class,"Loader-module__loader")]|//kat-panel[@data-testid="kat-panel-ActionPanelContent"]/div[@data-f1-component]//div[contains(@class,"==")]/div[contains(@class,"==")]/span',
+                timeout=3)
+            load_ele.wait.deleted(timeout=5, raise_err=False)
+        except Exception as e:
+            print("等待加载中消失出错", e)
+    
+    def clear_tab(self):
+        all_tab = self.browser.get_tabs(title="亚马逊",as_id=True)
+        close_tab = []
+        for tab in all_tab:
+            if self.tab.tab_id == tab:
+                continue
+            close_tab.append(tab)
+        print("需要关闭的标签页",close_tab)
+        print("当前操作的tab_id",self.tab.tab_id)
+        self.browser.close_tabs(close_tab)
+    
+    def handle_repair_product(self,tab:ChromiumTab):
+        def wait_loaded():
+            # 等待加载完成
+            try:
+                load_ele = tab.ele(
+                    'xpath://div[@class="contentWrapper"]//div[contains(@class,"==")]/span[not(node())]',
+                    timeout=3)
+                load_ele.wait.deleted(timeout=5, raise_err=False)
+            except Exception as e:
+                print("等待加载中消失出错", e)
+
+        tab.wait.doc_loaded(timeout=30)
+        submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10)
+        if len(submit_btn_ls) == 0:
+            print("未找到提交按钮，可能页面未加载完成或者页面结构发生变化")
+            return
+        # todo 遍历
+        for index in range(len(submit_btn_ls)):
+            if index > len(submit_btn_ls)-1:
+                print("提交按钮数量发生变化，停止处理")
+                break
+            
+            submit_btn = submit_btn_ls[index]
+
+            # 关闭按钮
+            close_x_btn = tab.eles('xpath://div[@class="flyoutPanelContent"]/span',timeout=5)
+            if len(close_x_btn) > 0:
+                close_x_btn[0].wait.displayed(timeout=5, raise_err=False)
+                close_x_btn[0].click()
+
+            submit_btn.wait.enabled(timeout=5, raise_err=False)
+            submit_btn.click()
+            time.sleep(0.5)
+            self.wait_loaded()
+
+            wait_loaded()
+
+            need_input = tab.eles('xpath://div[@class="contentWrapper"]//kat-input[@data-testid="kat-input-dew:ump_epr_resgitration_number_title"]',timeout=5)
+            if len(need_input) > 0:
+                print("需要输入注册号，不符合操作要求，跳过...")
+                continue
+
+            target_title = tab.eles('xpath://div[@class="contentWrapper"]//section//h4[text()="警告和安全信息"]')
+            if len(target_title) > 0:
+                not_start = tab.eles('xpath://div[@class="contentWrapper"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]')
+                if len(not_start) == 0:
+                    print("安全证明-不是未开始状态，不需要操作")
+                    continue
+
+                not_start.wait.displayed(timeout=5, raise_err=False)
+                not_start.click()
+
+                wait_loaded()
+
+                check = tab.ele('xpath://div[@class="contentWrapper"]//kat-checkbox[@name="value"]')
+                check.wait.displayed(timeout=5, raise_err=False)
+                check.click()
+
+                save_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]')
+                save_btn.wait.enabled(timeout=5, raise_err=False)
+                save_btn.click()
+
+                wait_loaded()
+
+                close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10)
+                close_btn.wait.displayed(timeout=5, raise_err=False)
+                close_btn.click()
+
+            save_btn_ls = tab.eles('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]',timeout=5)
+            if len(save_btn_ls) > 0:
+                option_selection_ls = tab.eles('xpath://div[@class="contentWrapper"]//div[@role="option"]',timeout=5)
+                for option in option_selection_ls:
+                    option.click()
+                    time.sleep(0.5)
+
+                save_btn_ls[0].wait.enabled(timeout=5, raise_err=False)
+                save_btn_ls[0].click()
+
+                wait_loaded()
+
+                close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10)
+                close_btn.wait.displayed(timeout=5, raise_err=False)
+                close_btn.wait.enabled(timeout=5, raise_err=False)
+                close_btn.click()
+
+            submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10)
+
+        print("修复商品信息处理完成！")
+        tab.close()
+
+    def run_page_action(self):
+        print("开始执行")
+        num = 0
+
+        while 1:
+            if num > 3:  #测试
+                return
+            # 等待加载完成
+            load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5)
+            if len(load_ele) > 0:
+                load_ele[0].wait.deleted(timeout=3, raise_err=False)
+                time.sleep(0.5)
+
+            # 获取当前页码
+            page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5)
+            if len(page_pamel) > 0:
+                current_page = page_pamel[0].sr('xpath:.//ul[@class="pages"]//li[@aria-current="true"]').text
+                print(f"开始处理，当前页码: {current_page}")
+
+            sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=3)
+            print(f"获取到 {len(sku_ls)}")
+            for sku_ele in sku_ls[0:2]:
+                # solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]')
+                solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]|.//kat-link[@label="修复被禁止显示的商品"]|//kat-link[@label="解决商品移除风险"]')
+                if len(solve_problem) == 0:
+                    continue
+                asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]').text
+                print(f"ASIN {asin} 存在问题，正在点击解决...")
+                solve_problem[0].click()
+
+
+                action_panel = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]')
+                action_panel.wait.displayed(timeout=5, raise_err=False)
+
+                self.wait_loaded()
+
+                # 如果存在“请求批准”按钮，则直接返回跳过
+                request_approval_btn = self.tab.eles('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="section-header" and contains(string(.),"移除")]',timeout=5)
+                if len(request_approval_btn) > 0:
+                    print(f"ASIN {asin} 存在请求批准按钮，不需要处理,跳过...")
+                    panel_close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]',
+                                                   timeout=5).sr('xpath:.//button[@class="close"]')
+                    panel_close_btn.click()
+
+                    action_panel.wait.deleted(timeout=3, raise_err=False)
+                    yield (asin,"请求批准")
+
+                
+                # 解决商品信息违规问题 按钮
+                kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]',timeout=5)
+                if len(kat_box_ls) == 0:
+                    print(f"ASIN {asin} 的操作面板中未找到选项，跳过...")
+                    continue
+                print(f"ASIN {asin}需要处理的有：{len(kat_box_ls)}个问题.")
+                # 解决商品信息违规问题 按钮，有多少个都要处理
+                for i in range(len(kat_box_ls)):
+                    print(f"开始处理第{i}个问题")
+                    kat_box_ls[i].click()
+                    time.sleep(0.5)
+                    self.wait_loaded()
+
+                    # TODO 增加 “出现警告和安全信息时候下滑” 的情况
+                    safe_handle_ls = self.tab.eles('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]',
+                                                    timeout=5)
+                    if len(safe_handle_ls) > 0:
+                        print("存在安全证明，正在处理...")
+                        safe_handle_ls[0].click()
+                        time.sleep(0.5)
+                        self.wait_loaded()
+                        check_box = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-checkbox')
+                        check_box.click()
+                    else:
+                        problem_selection_ls = self.tab.eles(
+                            'xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="registry-list"]//div[@data-testid="registry"]',
+                            timeout=10)
+                        print("待选择数量",len(problem_selection_ls))
+                        for problem_selection in problem_selection_ls:
+                            problem_selection.click()
+                            print("点击选择完成")
+                            time.sleep(0.5)
+
+                    # 点击保存
+                    confirm_btn = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//kat-button[@variant="primary"]')
+                    confirm_btn.wait.displayed(timeout=3, raise_err=False)  
+                    confirm_btn.click()
+
+                    self.wait_loaded()
+
+                    # 等待关闭按钮出现
+                    try:
+                        close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-button[@label="关闭"]',
+                                                    timeout=10)
+                        close_btn.click()
+                    except Exception as e:
+                        print("点击关闭按钮失败",e)
+
+                    kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]', timeout=5)
+                
+                # 修复商品信息
+                repair_product = action_panel.eles('xpath://kat-button[@class="action-button"]',timeout=5)
+                if len(repair_product) > 0:
+                    print(f"ASIN {asin} 存在修复商品信息按钮，正在点击...")
+                    self.clear_tab()
+                    repair_product[0].click()
+                    time.sleep(1)
+                    # 获取最新的tab
+                    new_tab = self.browser.latest_tab
+                    if isinstance(new_tab, str):
+                        new_tab = self.browser.get_tab(id_or_num=new_tab)
+                        
+                    self.handle_repair_product(new_tab)
+                    
+                yield (asin,"处理完成")
+                # 全部操作完成，关闭
+                panel_close_btn= self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]',
+                                                timeout=5).sr('xpath:.//button[@class="close"]')
+                panel_close_btn.click()
+
+                action_panel.wait.deleted(timeout=3, raise_err=False)
+                
+            
+            # 判断是否存在需要翻页的情况
+            page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5)
+            if len(page_pamel) == 0:
+                break
+            next_page_btn = page_pamel[0].sr('xpath:.//span[@part="pagination-nav-right"]')
+            class_str = next_page_btn.attr('class')
+            if "end" in class_str:
+                break
+            next_page_btn.click()
+            num += 1
+            print(f"正在翻页，已翻 {num} 页...")
+
+
+class ApproveTask:
+    """审批任务处理类：负责处理产品风险审批任务"""
+    
+    country_info = {
+        "DE": "德国",
+        "FR": "法国",
+        "ES": "西班牙",
+        "IT": "意大利",
+        "UK": "英国"
+    }
+    
+    """
+    处理流程：
+    1、解析任务json,提取对应的companyName 组组装user_info实例化 AmzoneApprove
+    2、打开对应的店铺、遍历所有的国家站点处理
+    3、切换至指定国家，切换至 管理所有库存页面
+    4、调用search方法，查询出是否存在需要审批的商品，如果没有则结束；如果有则进入处理流程
+    5、进入处理流程后，调用run_page_action方法(注意是通过yield 返回数据的)
+    
+    任务json示例：
+    {
+        "type": "product-risk-resolve-run",
+        "ts": 1775395996876,
+        "data": {
+            "taskId": 925,
+            "items": [
+                {
+                    "matched": true,
+                    "platform": "亚马逊",
+                    "shopName": "魏振峰",
+                    "shopId": "27543917795757",
+                    "companyName": "rongchuang123",
+                    "openStoreUrl": null,
+                    "matchedUserId": 17543915345493,
+                    "matchStatus": "MATCHED",
+                    "matchMessage": null
+                }
+            ],
+            "country_codes": [
+                "UK",
+                "DE",
+                "FR",
+                "ES"
+            ]
+        }
+    }
+    """
+    
+    def __init__(self, user_info: dict = None):
+        """初始化审批任务处理器
+        
+        Args:
+            user_info: 用户信息字典，包含 company, username, password
+        """
+        self.user_info = user_info or {}
+        self.running = True
+        
+    def log(self, message: str, level: str = "INFO"):
+        """日志输出
+        
+        Args:
+            message: 日志消息
+            level: 日志级别
+        """
+        from datetime import datetime
+        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        print(f"[{timestamp}] [ApproveTask] [{level}] {message}")
+    
+    def process_task(self, task_data: dict):
+        """处理审批任务主入口
+        
+        Args:
+            task_data: 任务数据
+        """
+        try:
+            data = task_data.get("data", {})
+            task_id = data.get("taskId")
+            items = data.get("items", [])
+            country_codes = data.get("country_codes", [])
+            risk_listing_filter = data.get("risk_listing_filter", "")
+
+            if not task_id:
+                self.log("任务ID为空，跳过", "WARNING")
+                return
+            
+            if not items:
+                self.log("店铺列表为空，跳过", "WARNING")
+                return
+                
+            if not country_codes:
+                self.log("国家列表为空，跳过", "WARNING")
+                return
+            
+            self.log(f"开始处理审批任务 {task_id}，共 {len(items)} 个店铺，{len(country_codes)} 个国家")
+            
+            from config import runing_task
+            runing_task[task_id] = {
+                "status": "running",
+                "start_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                "total_shops": len(items),
+                "processed_shops": 0,
+                "total_countries": len(country_codes) * len(items),
+                "processed_countries": 0,
+                "total_asins": 0,
+                "processed_asins": 0,
+                "success_count": 0,
+                "failed_count": 0,
+                "stop_requested": False
+            }
+            
+            # 遍历处理每个店铺
+            for idx, shop_item in enumerate(items, 1):
+                # 检查是否收到暂停请求
+                if task_id in runing_task and runing_task[task_id].get("stop_requested", False):
+                    self.log(f"检测到任务 {task_id} 的暂停请求，停止处理", "WARNING")
+                    runing_task[task_id]["status"] = "stopped"
+                    return
+                
+                shop_name = shop_item.get("shopName", "未知店铺")
+                self.log(f"[{idx}/{len(items)}] 开始处理店铺: {shop_name}")
+                
+                try:
+                    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
+                except Exception as e:
+                    import traceback
+                    self.log(f"处理店铺 {shop_name} 失败: {str(e)}", "ERROR")
+                    self.log(traceback.format_exc(), "ERROR")
+            
+            # 更新任务状态
+            if task_id in runing_task:
+                if runing_task[task_id].get("stop_requested", False):
+                    runing_task[task_id]["status"] = "stopped"
+                    self.log(f"任务 {task_id} 已被暂停！")
+                else:
+                    runing_task[task_id]["status"] = "completed"
+                    self.log(f"任务 {task_id} 处理完成！")
+            
+        except Exception as e:
+            import traceback
+            self.log(f"任务处理失败: {traceback.format_exc()}", "ERROR")
+            if task_id:
+                from config import runing_task
+                if task_id in runing_task:
+                    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):
+        """处理单个店铺
+        
+        Args:
+            shop_item: 店铺信息
+            country_codes: 国家代码列表
+            task_id: 任务ID
+            risk_listing_filter: 风险商品筛选条件
+        """
+        shop_name = shop_item.get("shopName", "未知店铺")
+        company_name = shop_item.get("companyName", "")
+
+        if not company_name:
+            self.log(f"店铺 {shop_name} 的公司名称为空，跳过", "WARNING")
+            return
+        
+
+        if task_id in runing_task:
+            runing_task[task_id]["current_shop"] = shop_name
+        
+        # 将店铺添加到正在执行中的店铺列表
+        start_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        runing_shop[shop_name] = start_time
+        self.log(f"店铺 {shop_name} 已添加到执行列表，账号: {company_name}，开始时间: {start_time}")
+        
+        # 店铺打开重试最多3次
+        driver = None
+        max_retries = 3
+        
+        for retry in range(max_retries):
+            try:
+                self.log(f"尝试打开店铺 {shop_name} (第 {retry + 1}/{max_retries} 次)")
+                
+                # 如果不是第一次尝试，先杀进程
+                if retry > 0:
+                    self.log("重试前先杀掉浏览器进程...")
+                    kill_process("v6")
+                    kill_process("v5")
+                    time.sleep(2)
+                
+                # 组装用户信息并创建驱动
+                user_info = {
+                    **self.user_info,
+                    "company": company_name
+                }
+                driver = AmzoneApprove(user_info)
+                browser = driver.open_shop(shop_name)
+                
+                if browser and browser != "店铺不存在":
+                    self.log(f"成功打开店铺 {shop_name}")
+                    break
+                else:
+                    self.log(f"打开店铺失败: {browser}", "WARNING")
+                    driver = None
+                    
+            except Exception as e:
+                import traceback
+                self.log(f"打开店铺异常: {str(e)}", "ERROR")
+                self.log(traceback.format_exc(), "ERROR")
+                driver = None
+                
+            # 如果还有重试机会，等待后继续
+            if retry < max_retries - 1:
+                time.sleep(3)
+        
+        # 检查是否成功打开
+        if not driver or not browser or browser == "店铺不存在":
+            self.log(f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺", "ERROR")
+            # 从执行列表中移除
+            if shop_name in runing_shop:
+                del runing_shop[shop_name]
+            return
+        
+        try:
+            # 处理每个国家
+            for country_code in country_codes:
+                # 检查是否收到暂停请求
+                if task_id in runing_task and runing_task[task_id].get("stop_requested", False):
+                    self.log(f"检测到任务 {task_id} 的暂停请求，停止处理国家", "WARNING")
+                    break
+                
+                try:
+                    self.process_country(driver, country_code, task_id, shop_name,risk_listing_filter)
+                except Exception as e:
+                    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)
+            except Exception as e:
+                self.log(f"回传结果失败: {str(e)}", "ERROR")
+        finally:
+            # 关闭店铺
+            try:
+                if driver:
+                    self.log(f"关闭店铺 {shop_name}")
+                    driver.close_store()
+                    time.sleep(2)
+            except Exception as e:
+                self.log(f"关闭店铺失败: {str(e)}", "WARNING")
+            
+            # 从正在执行中的店铺列表中移除
+            if shop_name in runing_shop:
+                del runing_shop[shop_name]
+                self.log(f"店铺 {shop_name} 已从执行列表中移除")
+    
+    def process_country(self, driver: AmzoneApprove, country_code: str, task_id: int, shop_name: str, risk_listing_filter: str):
+        """处理单个国家的审批任务
+        
+        Args:
+            driver: AmzoneApprove驱动实例
+            country_code: 国家代码（如 UK, DE, FR 等）
+            task_id: 任务ID
+            shop_name: 店铺名称
+            risk_listing_filter: 风险商品筛选条件
+        """
+        from config import runing_task
+        
+        # 转换国家代码为中文名称
+        country_name = self.country_info.get(country_code, country_code)
+        self.log(f"开始处理国家: {country_name} ({country_code})")
+        
+        # 更新当前处理的国家
+        if task_id in runing_task:
+            runing_task[task_id]["current_country"] = country_name
+        
+        # 切换国家，最多重试3次
+        max_retries = 3
+        switch_success = False
+        
+        for retry in range(max_retries):
+            try:
+                self.log(f"尝试切换到国家 {country_name} (第 {retry + 1}/{max_retries} 次)")
+                
+                # 如果不是第一次尝试，先刷新页面
+                if retry > 0:
+                    self.log("重试前刷新页面...")
+                    try:
+                        driver.tab.refresh()
+                        time.sleep(3)
+                    except Exception as e:
+                        self.log(f"刷新页面失败: {str(e)}", "WARNING")
+                
+                switch_success = driver.SwitchingCountries(country_name)
+                if switch_success:
+                    self.log(f"成功切换到国家 {country_name}")
+                    break
+                else:
+                    self.log(f"切换到国家 {country_name} 失败", "WARNING")
+                    
+            except Exception as e:
+                import traceback
+                self.log(f"切换国家 {country_name} 异常: {str(e)}", "ERROR")
+                self.log(traceback.format_exc(), "ERROR")
+                
+            # 如果还有重试机会，等待后继续
+            if retry < max_retries - 1:
+                time.sleep(2)
+        
+        # 如果切换失败，直接返回
+        if not switch_success:
+            self.log(f"切换到国家 {country_name} 失败，已重试 {max_retries} 次，跳过该国家", "ERROR")
+            if task_id in runing_task:
+                runing_task[task_id]["processed_countries"] += 1
+            return
+        
+        # 切换到库存管理页面
+        try:
+            driver.SwitchPage()
+            self.log(f"已切换到库存管理页面")
+        except Exception as e:
+            import traceback
+            self.log(f"切换页面失败: {str(e)}", "ERROR")
+            self.log(traceback.format_exc(), "ERROR")
+            if task_id in runing_task:
+                runing_task[task_id]["processed_countries"] += 1
+            return
+        
+        # 搜索需要审批的商品，最多重试3次
+        sku_ls = []
+        for retry in range(max_retries):
+            try:
+                self.log(f"尝试搜索需要审批的商品 (第 {retry + 1}/{max_retries} 次)")
+                sku_ls = driver.search(filter_type=risk_listing_filter)
+                break
+            except Exception as e:
+                self.log(f"搜索商品异常: {str(e)}", "ERROR")
+                if retry < max_retries - 1:
+                    try:
+                        driver.tab.refresh()
+                        time.sleep(3)
+                    except Exception as refresh_error:
+                        self.log(f"刷新页面失败: {str(refresh_error)}", "WARNING")
+        
+        # 如果没有需要审批的商品，直接返回
+        if len(sku_ls) == 0:
+            self.log(f"国家 {country_name} 没有需要审批的商品")
+            if task_id in runing_task:
+                runing_task[task_id]["processed_countries"] += 1
+            return
+        
+        self.log(f"国家 {country_name} 有 {len(sku_ls)} 个需要审批的商品，开始处理...")
+        
+        # 处理所有需要审批的商品（通过yield获取结果）
+        try:
+            for asin, status in driver.run_page_action():
+                # 检查是否收到暂停请求
+                if task_id in runing_task and runing_task[task_id].get("stop_requested", False):
+                    self.log(f"检测到任务 {task_id} 的暂停请求，停止处理ASIN", "WARNING")
+                    break
+                
+                self.log(f"ASIN {asin} 处理结果: {status}")
+                
+                # 更新任务状态
+                if task_id in runing_task:
+                    runing_task[task_id]["current_asin"] = asin
+                    runing_task[task_id]["processed_asins"] += 1
+                    
+                    if status == "处理完成":
+                        runing_task[task_id]["success_count"] += 1
+                    elif status == "请求批准":
+                        # 请求批准的商品也算作成功（因为不需要处理）
+                        runing_task[task_id]["success_count"] += 1
+                    else:
+                        runing_task[task_id]["failed_count"] += 1
+                
+                # 回传结果到API
+                try:
+                    self.post_result(task_id, shop_name, country_code, asin, status)
+                except Exception as e:
+                    self.log(f"回传结果失败: {str(e)}", "ERROR")
+                    
+        except Exception as e:
+            import traceback
+            self.log(f"处理审批商品异常: {str(e)}", "ERROR")
+            self.log(traceback.format_exc(), "ERROR")
+        
+        # 更新已处理国家数
+        if task_id in runing_task:
+            runing_task[task_id]["processed_countries"] += 1
+        
+        self.log(f"国家 {country_name} 处理完成")
+    
+    def post_result(self, task_id: int, shop_name: str, country_code: str, asin: str, status: str,is_done: bool = False):
+        """回传处理结果到API
+        
+        Args:
+            task_id: 任务ID
+            shop_name: 店铺名称
+            country_code: 国家代码
+            asin: ASIN
+            status: 处理状态
+        """
+        import requests
+        from config import DELETE_BRAND_API_BASE
+        
+        url = f"{DELETE_BRAND_API_BASE}/api/product-risk-resolve/tasks/{task_id}/result"
+        if status == "请求批准":
+            country_data = {
+                            "status": "",
+                            "shopName": shop_name,
+                            "productAsinSku": "",
+                            "done": is_done,
+                            "removeAsin": asin,
+                            "removeStatus": status
+                        }
+        else:
+            country_data = {
+                            "status": status,
+                            "shopName": shop_name,
+                            "productAsinSku": asin,
+                            "done": is_done,
+                            "removeAsin": "",
+                            "removeStatus": ""
+                        }
+            
+        payload = {
+            "shops": [
+                {
+                    "error": "",
+                    "countries": {
+                        country_code : [ country_data ]
+                    },
+                    "shopName": shop_name
+                }
+            ]
+        }
+        
+        max_retries = 3
+        for retry in range(max_retries):
+            try:
+                print("=====================================")
+                self.log(f"尝试回传结果 (第 {retry + 1}/{max_retries} 次)")
+                self.log(f"回传URL: {url}")
+                self.log(f"回传数据: {payload}")
+                response = requests.post(
+                    url,
+                    json=payload,
+                    headers={"Content-Type": "application/json"},
+                    timeout=30,
+                    verify=False
+                )
+                self.log(f"回传结果: {response.text}")
+                
+                if response.status_code == 200:
+                    self.log(f"结果回传成功: {asin} - {status}")
+                    return
+                else:
+                    self.log(f"结果回传失败，状态码: {response.status_code}", "WARNING")
+                print("=====================================")
+                    
+            except Exception as e:
+                self.log(f"调用API异常: {str(e)}", "ERROR")
+                print("=====================================")
+                
+            # 如果还有重试机会，等待后继续
+            if retry < max_retries - 1:
+                time.sleep(2)
+        
+        self.log(f"已达到最大重试次数，结果回传最终失败", "ERROR")
+        
+
+
+if __name__ == '__main__':
+    user_info = {
+        "company": "rongchuang123",
+        "username": "自动化_Robot",
+        "password": "#20zsg25"
+    }
+    shop_name = "魏振峰"
+    country = "德国"
+    kill_process('v6')
+    driver = AmzoneApprove(user_info)
+    browser = driver.open_shop(shop_name)
+    sw_suc = driver.SwitchingCountries(country)
+    driver.SwitchPage()
+    risk_listing_filter = "ApprovalRequired"
+    for _ in range(3):
+        try:
+            sku_ls = driver.search(filter_type=risk_listing_filter)
+            break
+        except Exception as e:
+            print(e)
+            driver.tab.refresh()
+    if len(sku_ls) > 0:
+        print("有数据，开始操作")
+        for asin, status in driver.run_page_action():
+            print(f"ASIN {asin} 的处理结果: {status}")
+        print("已完成操作")
+

app/amazon/del_brand.py

@@ -52,7 +52,8 @@ class ZiniaoDriver:
             command, _ = winreg.QueryValueEx(key, "")
             winreg.CloseKey(key)
             if isinstance(command, str):
-                exe_path = command.split()[0]
+                sub = "ziniao.exe"
+                exe_path = command[0: command.find(sub)+len(sub)+1]
             else:
                 exe_path = command[0]
             return exe_path
@@ -62,7 +63,8 @@ class ZiniaoDriver:
                 command, _ = winreg.QueryValueEx(key, "")
                 winreg.CloseKey(key)
                 if isinstance(command, str):
-                    exe_path = command.split()[0]
+                    sub = "ziniao.exe"
+                    exe_path = command[0: command.find(sub)+len(sub)+1]
                 else:
                     exe_path = command[0]
                 return exe_path
@@ -107,6 +109,7 @@ class ZiniaoDriver:
         """
         if version == "v5":
             process_name = 'SuperBrowser.exe'
+            os.system('taskkill /f /t /im ' + "starter.exe")
         else:
             process_name = 'ziniao.exe'
         os.system('taskkill /f /t /im ' + process_name)
@@ -206,7 +209,7 @@ class ZiniaoDriver:
 
     def start_client(self):
         """启动紫鸟客户端"""
-        self.client_path = self.get_zinaio_exe("superbrowser").strip('"')
+        self.client_path = self.get_zinaio_exe("superbrowserv6").strip('"')
         print(self.client_path)
         cmd = [self.client_path, '--run_type=web_driver', '--ipc_type=http',
                '--port=' + str(self.socket_port)]
@@ -339,9 +342,9 @@ class ZiniaoDriver:
             return False
 
 
-class AmazoneDriver(ZiniaoDriver):
-    """亚马逊专用驱动类，继承自ZiniaoDriver"""
-
+class AmamzonBase(ZiniaoDriver):
+    """亚马逊操作基类，包含一些通用方法"""
+    
     def SwitchingCountries(self, country_name: str):
         """
         切换国家
@@ -433,6 +436,12 @@ class AmazoneDriver(ZiniaoDriver):
             print(f"切换国家时发生异常：{traceback.format_exc()}")
             return False
 
+
+
+
+class AmazoneDriver(AmamzonBase):
+    """亚马逊专用驱动类，继承自ZiniaoDriver"""
+
     def SwitchPage(self):
         """
         切换至 管理所有库存页面

app/amazon/main.py

@@ -6,6 +6,7 @@ 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
 from amazon.del_brand import AmazoneDriver, kill_process
+from amazon.approve import ApproveTask
 
 
 class TaskMonitor:
@@ -26,6 +27,7 @@ class TaskMonitor:
 
         # 在提交新任务前杀掉旧进程（确保环境干净）
         kill_process("v6")
+        kill_process("v5")
 
     def log(self, message: str, level: str = "INFO"):
         """日志输出
@@ -54,15 +56,23 @@ class TaskMonitor:
                     
                     # 检查任务类型
                     task_type = task_data.get("type", "")
-                    if task_type != "delete-brand-run":
+                    
+                    if task_type == "delete-brand-run":
+                        # 提交删除品牌任务到线程池
+                        self.log(f"接收到删除品牌任务，提交到线程池处理...")
+                        future = self.executor.submit(self._process_task_wrapper, task_data)
+                        futures.append(future)
+                        
+                    elif task_type == "product-risk-resolve-run":
+                        # 提交产品风险审批任务到线程池
+                        self.log(f"接收到产品风险审批任务，提交到线程池处理...")
+                        future = self.executor.submit(self._process_approve_task_wrapper, task_data)
+                        futures.append(future)
+                        
+                    else:
                         self.log(f"未知任务类型: {task_type}，跳过", "WARNING")
                         continue
                     
-                    # 提交任务到线程池
-                    self.log(f"接收到删除品牌任务，提交到线程池处理...")
-                    future = self.executor.submit(self._process_task_wrapper, task_data)
-                    futures.append(future)
-                    
                     # 清理已完成的future对象，避免内存累积
                     futures = [f for f in futures if not f.done()]
                     
@@ -86,11 +96,26 @@ class TaskMonitor:
             task_data: 任务数据
         """
         try:
-            self.log(f"线程 {id(task_data)} 开始处理任务...")
+            self.log(f"线程 {id(task_data)} 开始处理删除品牌任务...")
             self.process_task(task_data)
-            self.log(f"线程 {id(task_data)} 任务处理完成")
+            self.log(f"线程 {id(task_data)} 删除品牌任务处理完成")
         except Exception as e:
-            self.log(f"线程 {id(task_data)} 任务处理异常: {traceback.format_exc()}", "ERROR")
+            self.log(f"线程 {id(task_data)} 删除品牌任务处理异常: {traceback.format_exc()}", "ERROR")
+    
+    def _process_approve_task_wrapper(self, task_data: Dict[str, Any]):
+        """审批任务处理包装器（用于线程池调用）
+        
+        Args:
+            task_data: 任务数据
+        """
+        try:
+            self.log(f"线程 {id(task_data)} 开始处理产品风险审批任务...")
+            # 创建ApproveTask实例并处理任务
+            approve_task = ApproveTask(user_info=self.user_info)
+            approve_task.process_task(task_data)
+            self.log(f"线程 {id(task_data)} 产品风险审批任务处理完成")
+        except Exception as e:
+            self.log(f"线程 {id(task_data)} 产品风险审批任务处理异常: {traceback.format_exc()}", "ERROR")
                 
                 
     def process_task(self, task_data: Dict[str, Any]):
@@ -161,6 +186,7 @@ class TaskMonitor:
         shop_name = shop_data.get("shopName", "未知店铺")
         result_id = shop_data.get("resultId")
         countries = shop_data.get("countries", [])
+        company_name = shop_data.get("companyName", "未知公司")
         
         if not countries:
             self.log(f"店铺 {shop_name} 没有国家数据，跳过", "WARNING")
@@ -172,7 +198,7 @@ class TaskMonitor:
         # 将店铺添加到正在执行中的店铺列表
         start_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         runing_shop[shop_name] = start_time
-        self.log(f"店铺 {shop_name} 已添加到执行列表，开始时间: {start_time}")
+        self.log(f"账号：{company_name},店铺 {shop_name} 已添加到执行列表，开始时间: {start_time}")
         
         # 店铺打开重试最多3次
         driver = None
@@ -187,10 +213,15 @@ class TaskMonitor:
                 if retry > 0:
                     self.log("重试前先杀掉浏览器进程...")
                     kill_process("v6")
+                    kill_process("v5")
                     time.sleep(2)
                 
                 # 创建驱动并打开店铺
-                driver = AmazoneDriver(self.user_info)
+                user_info = {
+                    **self.user_info,
+                    "company": company_name
+                }
+                driver = AmazoneDriver(user_info)
                 browser = driver.open_shop(shop_name)
                 
                 if browser and browser != "店铺不存在":

app/main.py

@@ -154,8 +154,34 @@ class WindowAPI:
         )
         return result[0] if result else ''
 
+    def save_file_from_url(self, url, default_filename='download.zip'):
+        """弹窗选择保存位置，从 url 下载文件并保存。用于品牌任务结果 zip 等。"""
+        print("调用到save_file_from_url方法")
+        if not url or not url.strip():
+            return {'success': False, 'error': '下载地址为空'}
+        result = self._window.create_file_dialog(
+            webview.SAVE_DIALOG,
+            save_filename=default_filename,
+            file_types=('ZIP 压缩包 (*.zip)', '所有文件 (*.*)')
+        )
+        if not result:
+            return {'success': False, 'error': '用户取消'}
+        path = result[0] if isinstance(result, (list, tuple)) else result
+        try:
+            import requests
+            resp = requests.get(url.strip(), timeout=120, stream=True)
+            resp.raise_for_status()
+            with open(path, 'wb') as f:
+                for chunk in resp.iter_content(chunk_size=65536):
+                    if chunk:
+                        f.write(chunk)
+            return {'success': True, 'path': path}
+        except Exception as e:
+            return {'success': False, 'error': str(e)}
+
     def save_file_from_url_new(self, url, default_filename='download.bin'):
         """弹窗选择保存位置，从 url 下载文件并保存。根据文件后缀动态设置保存类型。"""
+        print("调用到save_file_from_url_new方法")
         if not url or not url.strip():
             return {'success': False, 'error': '下载地址为空'}
 
@@ -360,7 +386,7 @@ def main():
     )
     api = WindowAPI(window)
     window.expose(api.close, api.minimize, api.maximize, api.toggle_maximize, generate_images, api.save_image, api.save_image_to_folder, api.select_folder, api.select_brand_xlsx_files, api.select_brand_folder,
-                  api.save_file_from_url_new, api.save_template_xlsx,api.save_template_zip,api.upload_file_to_java,api.open_external_url,api.enqueue_json,api.get_detail_del)
+                  api.save_file_from_url, api.save_template_xlsx,api.save_template_zip,api.upload_file_to_java,api.open_external_url,api.enqueue_json,api.get_detail_del,api.save_file_from_url_new)
     webview.start(
         debug=True,
         storage_path=cache_path,

app/web_source/brand-旧.html

@@ -927,7 +927,7 @@
         }
         var zipUrl = task.result_paths.zip_url;
         var filename = 'brand_task_' + taskId + '.zip';
-        if (api && api.save_file_from_url_new) {
+        if (api && api.save_file_from_url) {
             a.style.pointerEvents = 'none';
             var done = function(ret) {
                 if (ret && ret.success) {
@@ -938,7 +938,7 @@
                 a.style.pointerEvents = '';
             };
             try {
-                var ret = api.save_file_from_url_new(zipUrl, filename);
+                var ret = api.save_file_from_url(zipUrl, filename);
                 if (ret && typeof ret.then === 'function') {
                     ret.then(done).catch(function(err) { showToast('保存失败：' + (err && err.message || err)); a.style.pointerEvents = ''; });
                 } else {

app/web_source/brand.html

@@ -416,6 +416,7 @@
                     </button>
                     <div class="nav-dropdown-menu">
                         <a class="nav-dropdown-item" href="/new_web_source/delete-brand.html">删除指定ASIN和品牌</a>
+                        <a class="nav-dropdown-item" href="/new_web_source/product-risk.html">商品风险解决</a>
                     </div>
                 </div>
             </div>
@@ -995,7 +996,7 @@
         }
         var zipUrl = task.result_paths.zip_url;
         var filename = 'brand_task_' + taskId + '.zip';
-        if (api && api.save_file_from_url_new) {
+        if (api && api.save_file_from_url) {
             a.style.pointerEvents = 'none';
             var done = function(ret) {
                 if (ret && ret.success) {
@@ -1006,7 +1007,7 @@
                 a.style.pointerEvents = '';
             };
             try {
-                var ret = api.save_file_from_url_new(zipUrl, filename);
+                var ret = api.save_file_from_url(zipUrl, filename);
                 if (ret && typeof ret.then === 'function') {
                     ret.then(done).catch(function(err) { showToast('保存失败：' + (err && err.message || err)); a.style.pointerEvents = ''; });
                 } else {

app/web_source/templates_backup/brand.html

@@ -877,7 +877,7 @@
         }
         var zipUrl = task.result_paths.zip_url;
         var filename = 'brand_task_' + taskId + '.zip';
-        if (api && api.save_file_from_url_new) {
+        if (api && api.save_file_from_url) {
             a.style.pointerEvents = 'none';
             var done = function(ret) {
                 if (ret && ret.success) {
@@ -888,7 +888,7 @@
                 a.style.pointerEvents = '';
             };
             try {
-                var ret = api.save_file_from_url_new(zipUrl, filename);
+                var ret = api.save_file_from_url(zipUrl, filename);
                 if (ret && typeof ret.then === 'function') {
                     ret.then(done).catch(function(err) { showToast('保存失败：' + (err && err.message || err)); a.style.pointerEvents = ''; });
                 } else {