From 489e7e8269ffd888b0d7ec48eb040989c912046c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=93=AD=E5=9D=A4?= <10372463+ming-kun@user.noreply.gitee.com> Date: Tue, 7 Apr 2026 14:09:42 +0800 Subject: [PATCH] new file: amazon/__pycache__/approve.cpython-39.pyc modified: amazon/__pycache__/del_brand.cpython-39.pyc modified: amazon/__pycache__/main.cpython-39.pyc new file: amazon/approve.py modified: amazon/del_brand.py modified: amazon/main.py modified: main.py --- app/amazon/__pycache__/approve.cpython-39.pyc | Bin 0 -> 20948 bytes .../__pycache__/del_brand.cpython-39.pyc | Bin 14794 -> 15117 bytes app/amazon/__pycache__/main.cpython-39.pyc | Bin 15382 -> 16455 bytes app/amazon/approve.py | 821 ++++++++++++++++++ app/amazon/del_brand.py | 21 +- app/amazon/main.py | 53 +- app/main.py | 28 +- 7 files changed, 905 insertions(+), 18 deletions(-) create mode 100644 app/amazon/__pycache__/approve.cpython-39.pyc create mode 100644 app/amazon/approve.py diff --git a/app/amazon/__pycache__/approve.cpython-39.pyc b/app/amazon/__pycache__/approve.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c2be601735097b1a73678b19b95282efa926c241 GIT binary patch literal 20948 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 literal 0 HcmV?d00001 diff --git a/app/amazon/__pycache__/del_brand.cpython-39.pyc b/app/amazon/__pycache__/del_brand.cpython-39.pyc index 950b0df98164e4a88fbd7cf2cd41892d68926f4a..0bfbfd5e0132d822d968704f6142e04876613925 100644 GIT binary patch delta 2545 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 diff --git a/app/amazon/__pycache__/main.cpython-39.pyc b/app/amazon/__pycache__/main.cpython-39.pyc index dcbaa46daffc12b2ce2eec3fbfeab419953cec77..fe242dbe214e006e96a1bf681a2e3bf835b22b1b 100644 GIT binary patch delta 5216 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 QAA%CdNzQkh9?;4E00Ynt+W-In delta 4323 zcmbtXYiu0V6`ngYJ3IUE`n6uaA2Dmk6Nj}ONJ0|FaYRT650ergWFah@y_0zT*tPG> zCbm19O=FiJ0?6SKDuDyGN>$(ot(pp4CDcki=Z@nT zW28#m(SCdHIp>~xUiaMD_fL}-CPK-Q62AnWJ*WSY{`A=SPy>1Od}m?9K8bp%J|j_m zT8>AkkNRh%c(qwW1H&?#H>;;5B2jWsGJ@y-@gaYY)R6}M38^7b{v{bGm_b@PC(|-o zKBLA<%#f*@9@BSBu9eInJS%3jVosx#Gz@a3Uz76)Ne`@p6|`#3MWVba70)!zCLM9iwdxXGF<6L|ikYZ`$^x%8fTGl?|+WREmW@&s3@ zlI@@Tj7WJ8k)~p_%nmr7X>x+F4}`vQcm9%eQKl6OasjtGEYZrm=agr>!~N}+x6UpHWuFh3eH6r?JxdPbN9{0QE{kwm*zQ&N@j%v?-2sx;tpJi7RzgIDoNGi@LQ0V6BurGrPs)g2 zsgOf*kk1CzlUyJBv>( z#A2~rC9>S9%UXQ%=_^mp=Bkj+cb8Q8w!&z@(AWl^D2eRug&7nTOQy`D$<%Pse=N&J zlXk+KNEr$f#kUJYSUdJ?Dw!zSl*(Ugj ztJYxl8zt-OJ#J>qi80o90#|M3FIRrHE)2t>j^YE!QS-|nOs~wnarKoSEnfb?=ln8j z<39|yl6&~?!qEu&!Vcg9uVrV)#!PAucGq)NgWH8_o4JdIR8h-XlCWJjUCXMkcW^Xh^$@1gz$ zlGhx~)*Pi556tzo0Y`%~=AKbK53M$@(_r3bdmZ02oYo^><^5AH3;7bUSIF_x(n7Ta zO`y#20hV9%ij(K36~ij~Scq04#nx$f8h?HBep)3c0WdBI4Z!Po=RqBqq&qsC*NCIj z$gm{$dkx{Em;7)=0w=ds>(q#I47lcD!KH%fduJFj0p2 zyN*;?4qv^9LBmB4UE1OxSUWX9OY=d;1L6C5zQmF3vJ=v*%;497n+JMPBW+rcks=Ij zc4UZS%k?CJzw-F0sT$ywJ6;FYJJ3j-;DVM9g0qi-vxU&CJUOxC?H;EDRKnc>9XBKt z-sFTpVRYGl)in-zcEx<)ChF#XN5TmyKTvw!g6`I_N-}+ zGI`?vGUvr_GpAe9@SqtT{KdNGn(l{F$qoXtS znh2(HjF}lbA(~kf*6=^pKdfQLVh?bmp;yDs{JG3?4M)jV{&7PeIl!wMhscBcOym7^ zZWlt~hY@6irFQg1V{1LO304CT_hrY-jJt{3qj+aiUEgw(iU(37S<6g7%VQ>VH_@e+ zTMv62R1|%#FW9(}sP}GuzRA$~aahZL+tjjeRS$a z5>ZqFj~s+|lvYItK718F-`+e?mw_d0907YD8$}TI)L!~i^WCa(90`L6`v7tnua&pg z;!D3+eDkgCE$lnIKN=-RxfyLKOQEFM76(I94g2+S~Mn%O=9xZyAc?=>q z$cB(PjIfk}srJ4*AHlf~g@a=(n=&mck+jkoqtZ>mw}%1Oi6Ef=Ec@L0ur`LHeqOh} zbHih((TAE6Y1j#1Lduf@8doNK!_k^#QAYX>p;nXY@uef)#2Dq{01 zT}Iozuj{2qcPF`%Ki<8LB>9={hjxeqv77<-rD_sIrw~@B z0BA+cGLtMd$PV+$o@hc8{{I{f)QQ1}`&jm5BAub;1VdX{7QxL2vNdZsml(0w0Dqxp zb9hxA9FQ2`pZ5HdT~gfo0}^F4*FFdQ(vZg51&il|`~vZoN-`h<~D;+El>hN0xD`Z$d=VbM7p^&_nE z_PY|i#}xUFE#sOfvvZezw&fNXPUw}})&*7`&Wdf(nvI}fub~#zAuF4Sdk4)VHJQa? zd|=zqIxMMNIl$uCCl+5l`}x^tuKnZ!ys)-(uuk0AhrJdKCplB z-7|}CzYV=%8l;Q>3!pHbR}qjRwCwR5{2#K4>R8sYSqE_90eI84b5 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("已完成操作") + diff --git a/app/amazon/del_brand.py b/app/amazon/del_brand.py index 23f0210..301062c 100644 --- a/app/amazon/del_brand.py +++ b/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): """ 切换至 管理所有库存页面 diff --git a/app/amazon/main.py b/app/amazon/main.py index a238b1a..5314d3b 100644 --- a/app/amazon/main.py +++ b/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 != "店铺不存在": diff --git a/app/main.py b/app/main.py index 3cc2e65..3bfc7d0 100644 --- a/app/main.py +++ b/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,