diff --git a/app/amazon/__pycache__/approve.cpython-39.pyc b/app/amazon/__pycache__/approve.cpython-39.pyc index 6251979..42e8fe4 100644 Binary files a/app/amazon/__pycache__/approve.cpython-39.pyc and b/app/amazon/__pycache__/approve.cpython-39.pyc differ diff --git a/app/amazon/__pycache__/del_brand.cpython-39.pyc b/app/amazon/__pycache__/del_brand.cpython-39.pyc index 0e5aacf..213f2a3 100644 Binary files a/app/amazon/__pycache__/del_brand.cpython-39.pyc and b/app/amazon/__pycache__/del_brand.cpython-39.pyc differ diff --git a/app/amazon/__pycache__/match_action.cpython-39.pyc b/app/amazon/__pycache__/match_action.cpython-39.pyc index 5b64d1b..33ee517 100644 Binary files a/app/amazon/__pycache__/match_action.cpython-39.pyc and b/app/amazon/__pycache__/match_action.cpython-39.pyc differ diff --git a/app/amazon/__pycache__/price_match.cpython-39.pyc b/app/amazon/__pycache__/price_match.cpython-39.pyc index b9ca6b6..e5afa4b 100644 Binary files a/app/amazon/__pycache__/price_match.cpython-39.pyc and b/app/amazon/__pycache__/price_match.cpython-39.pyc differ diff --git a/app/amazon/approve.py b/app/amazon/approve.py index 5d86c4b..a16c8db 100644 --- a/app/amazon/approve.py +++ b/app/amazon/approve.py @@ -922,7 +922,90 @@ class ApproveTask: if task_id in runing_task: runing_task[task_id]["status"] = "failed" runing_task[task_id]["error"] = str(e) - + + def open_shop(self,max_retries,company_name,shop_name,iskill=False): + error_info = "" + driver = None + for retry in range(max_retries): + try: + self.log(f"尝试打开店铺 {shop_name} (第 {retry + 1}/{max_retries} 次)") + + if iskill: + 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}") + 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} 需要登录，正在登录...") + # 获取店铺凭证 + 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: + self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") + browser = driver.open_shop(shop_name) + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name} 登录后") + break + else: + self.log(f"登录后打开店铺失败: {browser}", "WARNING") + driver = None + else: + self.log(f"店铺 {shop_name} 登录失败", "WARNING") + driver = None + else: + break + + except Exception as e: + import traceback + self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") + driver = None + error_info = str(e) + time.sleep(10) + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(3) + + # 检查是否成功打开 + if not driver or not browser or browser == "店铺不存在": + error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" + self.log(error_msg, "ERROR") + # 从执行列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + return driver + return driver + + def process_shop(self, shop_item: dict, country_codes: list, task_id: int, risk_listing_filter: str): """处理单个店铺 @@ -951,120 +1034,46 @@ class ApproveTask: # 店铺打开重试最多3次 driver = None max_retries = 3 - - error_info = "" - for retry in range(max_retries): + iskill = False + + # 处理每个国家 + 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 + + # 打开店铺 + driver = self.open_shop(max_retries=max_retries, company_name=company_name, + shop_name=shop_name, iskill=iskill) + if driver is None: + self.log(f"任务 {task_id} 启动店铺失败，结束任务", "ERROR") + for country_code in country_codes: + self.post_result(task_id, shop_name, country_code, "", "", is_done=True) + return + 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 - continue - - # 判断是否需要登录 - need_login = driver.need_login() - print("【是否需要登录】：",need_login) - if need_login: - self.log(f"店铺 {shop_name} 需要登录，正在登录...") - # 获取店铺凭证 - 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: - self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") - browser = driver.open_shop(shop_name) - if browser and browser != "店铺不存在": - self.log(f"成功打开店铺 {shop_name} 登录后") - break - else: - self.log(f"登录后打开店铺失败: {browser}", "WARNING") - driver = None - else: - self.log(f"店铺 {shop_name} 登录失败", "WARNING") - driver = None - else: - break + self.process_country(driver, country_code, task_id, shop_name,risk_listing_filter) except Exception as e: import traceback - self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") - driver = None - error_info = str(e) - time.sleep(10) - - # 如果还有重试机会，等待后继续 - if retry < max_retries - 1: - time.sleep(3) - - # 检查是否成功打开 - if not driver or not browser or browser == "店铺不存在": - error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" - self.log(error_msg, "ERROR") - # 从执行列表中移除 - if shop_name in runing_shop: - del runing_shop[shop_name] - return - + self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + if "与页面的连接已断开" in e: + iskill = True + + # 更新已处理国家数 + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + # 最后回传，标记完成 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} 已从执行列表中移除") + self.post_result(task_id, shop_name, country_code, "", "", is_done=True) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") + + # 从正在执行中的店铺列表中移除 + 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): """处理单个国家的审批任务 @@ -1176,42 +1185,33 @@ class ApproveTask: 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 in ["请求批准", "添加缺失的商品详情"]: - # 请求批准的商品也算作成功（因为不需要处理） - 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 + 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 in ["请求批准", "添加缺失的商品详情"]: + # 请求批准的商品也算作成功（因为不需要处理） + 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") + self.log(f"国家 {country_name} 处理完成") diff --git a/app/amazon/del_brand.py b/app/amazon/del_brand.py index fd0a311..af7c8ee 100644 --- a/app/amazon/del_brand.py +++ b/app/amazon/del_brand.py @@ -169,7 +169,7 @@ class ZiniaoDriver: "cookieTypeLoad": 0, "cookieTypeSave": cookieTypeSave, "runMode": "1", - "isLoadUserPlugin": False, + "isLoadUserPlugin": True, "pluginIdType": 1, "privacyMode": isprivacy } diff --git a/app/amazon/match_action.py b/app/amazon/match_action.py index 0eb6319..2a4d3e0 100644 --- a/app/amazon/match_action.py +++ b/app/amazon/match_action.py @@ -308,7 +308,89 @@ class MatchTak: if task_id in runing_task: runing_task[task_id]["status"] = "failed" runing_task[task_id]["error"] = str(e) - + + def open_shop(self,max_retries,company_name,shop_name,iskill=False): + error_info = "" + driver = None + for retry in range(max_retries): + try: + self.log(f"尝试打开店铺 {shop_name} (第 {retry + 1}/{max_retries} 次)") + + if iskill: + self.log("重试前先杀掉浏览器进程...") + kill_process("v6") + kill_process("v5") + time.sleep(2) + + # 组装用户信息并创建驱动 + user_info = { + **self.user_info, + "company": company_name + } + driver = AmzoneMatchAction(user_info) + browser = driver.open_shop(shop_name) + + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name}") + 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} 需要登录，正在登录...") + # 获取店铺凭证 + 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: + self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") + browser = driver.open_shop(shop_name) + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name} 登录后") + break + else: + self.log(f"登录后打开店铺失败: {browser}", "WARNING") + driver = None + else: + self.log(f"店铺 {shop_name} 登录失败", "WARNING") + driver = None + else: + break + + except Exception as e: + import traceback + self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") + driver = None + error_info = str(e) + time.sleep(10) + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(3) + + # 检查是否成功打开 + if not driver or not browser or browser == "店铺不存在": + error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" + self.log(error_msg, "ERROR") + # 从执行列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + return driver + return driver + # 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,limit:str=None): @@ -339,124 +421,52 @@ class MatchTak: # 店铺打开重试最多3次 driver = None max_retries = 3 - - error_info = "" - for retry in range(max_retries): + iskill = False + + # 处理每个国家 + 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 + + # 打开店铺 + driver = self.open_shop(max_retries=max_retries, company_name=company_name, + shop_name=shop_name, iskill=iskill) + if driver is None: + self.log(f"任务 {task_id} 启动店铺失败，结束任务", "ERROR") + for country_code in country_codes: + self.post_result(task_id, shop_name, country_code, "", "", is_done=True) + return + 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 = AmzoneMatchAction(user_info) - browser = driver.open_shop(shop_name) - - if browser and browser != "店铺不存在": - self.log(f"成功打开店铺 {shop_name}") - 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} 需要登录，正在登录...") - # 获取店铺凭证 - 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: - self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") - browser = driver.open_shop(shop_name) - if browser and browser != "店铺不存在": - self.log(f"成功打开店铺 {shop_name} 登录后") - break - else: - self.log(f"登录后打开店铺失败: {browser}", "WARNING") - driver = None - else: - self.log(f"店铺 {shop_name} 登录失败", "WARNING") - driver = None - else: - break - + self.process_country(driver, country_code, task_id, shop_name,risk_listing_filter,limit) except Exception as e: import traceback - self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") - driver = None - error_info = str(e) - time.sleep(10) - - # 如果还有重试机会，等待后继续 - if retry < max_retries - 1: - time.sleep(3) - - # 检查是否成功打开 - if not driver or not browser or browser == "店铺不存在": - error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" - self.log(error_msg, "ERROR") - # 从执行列表中移除 - if shop_name in runing_shop: - del runing_shop[shop_name] - return - + self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + if "与页面的连接已断开" in e: + iskill = True + + # 更新已处理国家数 + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + + # 最后回传，标记完成 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,limit) - 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) - if final_stage: - self.post_result(task_id, shop_name, country_code, "", "", is_done=True) - else: - self.post_stage_finished(task_id, user_id, stage_index) - 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} 已从执行列表中移除") + # 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: + self.post_stage_finished(task_id, user_id, stage_index) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") + + + # 从正在执行中的店铺列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + self.log(f"店铺 {shop_name} 已从执行列表中移除") def process_country(self, driver: AmzoneMatchAction, country_code: str, task_id: int, shop_name: str, risk_listing_filter: str,limit:str=None): """处理单个国家的审批任务 @@ -487,7 +497,16 @@ class MatchTak: for retry in range(max_retries): try: self.log(f"尝试切换到国家 {country_name} (第 {retry + 1}/{max_retries} 次)") - + if retry > 1: + # 刷新不行就重新打开店铺 + self.log("重试前重新打开店铺...") + try: + driver.close_store() + time.sleep(3) + driver.open_shop(shop_name) + except Exception as e: + self.log(f"关闭重新打开店铺: {str(e)}", "WARNING") + # 如果不是第一次尝试，先刷新页面 if retry > 0: self.log("重试前刷新页面...") @@ -559,36 +578,28 @@ class MatchTak: 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 + 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 + + 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") - 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} 处理完成") diff --git a/app/amazon/price_match.py b/app/amazon/price_match.py index 08e393f..73ee741 100644 --- a/app/amazon/price_match.py +++ b/app/amazon/price_match.py @@ -114,6 +114,30 @@ def calculate_standard_competitor_pricing(my_current_price, target_competitor_pr class ChromeAmzone: mark_name = "亚马逊详情采集" + country_info = { + "英国": { + "url": "https://www.amazon.co.uk/dp/B0CJ8SNXXV", + "zip_code": "SW1A 1AA", + "mark": "SW1A 1" + }, + "德国": { + "url": "https://www.amazon.de/dp/B0CC8CW9G2?th=1", + "zip_code": "10115" + }, + "法国": { + "url": "https://www.amazon.fr/dp/B0FRG1MJ8H?th=1", + "zip_code": "75001" + }, + "西班牙": { + "url": "https://www.amazon.es/dp/B08ZXVNYNN", + "zip_code": "28001" + }, + "意大利": { + "url": "https://www.amazon.it/dp/B0D1P17T2Q", + "zip_code": "20121" + } + } + def __init__(self,tab): self.tab = tab @@ -136,8 +160,92 @@ class ChromeAmzone: if len(accept_btn) > 0: accept_btn[0].click() + def _set_zip_code(self, zip_code, mark=None): + """ + 设置邮编 - def run(self): + Args: + zip_code: 目标邮编 + """ + try: + # 检查当前邮编 + zip_display = self.tab.ele('xpath://div[@id="glow-ingress-block"]', timeout=10) + + if zip_display: + current_text = zip_display.text + # print(f"当前地址信息: {current_text}") + # 先检查标识 + if mark is not None and mark in current_text: + print(f"邮编检测到标识: {mark}，无需修改") + return True + # 检查是否已经包含目标邮编 + if zip_code in current_text: + print(f"邮编已经设置为: {zip_code}，无需修改") + return True + + # 需要设置邮编 + print(f"正在设置邮编为: {zip_code}") + + # 点击地址选择按钮 + location_link = self.tab.ele('xpath://a[@id="nav-global-location-popover-link"]', timeout=10) + if not location_link: + print("找不到地址设置按钮") + return False + + location_link.click() + time.sleep(1) + + # 等待邮编输入框出现 + zip_input = self.tab.ele('xpath://input[@id="GLUXZipUpdateInput"]', timeout=10) + if not zip_input: + print("找不到邮编输入框") + return False + + # 输入邮编 + zip_input.input(zip_code, clear=True) + time.sleep(0.5) + + # 点击提交按钮 + submit_btn = self.tab.ele('xpath://input[@aria-labelledby="GLUXZipUpdate-announce"]', timeout=10) + if not submit_btn: + print("找不到提交按钮") + return False + + submit_btn.click() + + continue_btn = self.tab.eles('xpath://div[@class="a-popover-footer"]//input[@id="GLUXConfirmClose"]', + timeout=10) + if len(continue_btn) > 0: + continue_btn[0].click() + + # 等待提交按钮消失（表示请求已发送） + print("等待邮编更新...") + time.sleep(2) + + # 等待页面加载完成 + self.tab.wait.doc_loaded(timeout=30, raise_err=False) + time.sleep(2) + + # 验证邮编是否设置成功 + zip_display_after = self.tab.ele('xpath://div[@id="glow-ingress-block"]', timeout=10) + if zip_display_after: + updated_text = zip_display_after.text + # print(f"更新后的地址信息: {updated_text}") + + if zip_code in updated_text: + print(f"邮编设置成功: {zip_code}") + return True + else: + # print(f"邮编设置可能失败，当前显示: {updated_text}") + return False + + return True + + except Exception as e: + print(f"设置邮编时出错: {traceback.format_exc()}") + return False + + def run(self,country): """ 运行亚马逊详情采集任务 @@ -149,6 +257,20 @@ class ChromeAmzone: dict: 包含采集到的数据 """ try: + if country not in self.country_info: + error_msg = f"不支持的国家: {country}，支持的国家有: {list(self.country_info.keys())}" + print(error_msg) + show_notification(error_msg, "error") + return None + # 获取国家配置 + country_config = self.country_info[country] + zip_code = country_config["zip_code"] + mark = country_config.get("mark") + + self._set_zip_code(zip_code,mark) + + self.tab.wait.doc_loaded(timeout=5,raise_err=False) + self.tab.wait.doc_loaded(timeout=30, raise_err=False) @@ -379,7 +501,15 @@ class AmzonePriceMatch(AmamzonBase): print("当前操作的tab_id",self.tab.tab_id) self.browser.close_tabs(close_tab) - def run_page_action(self,current_shop_name:str,appoint_asin:str=None,skip_asin:list=[]): + def run_page_action(self,current_shop_name:str,mode:str, + appoint_asin:str=None,skip_asin:list=[],miniprice_info:dict={}): + """ + + miniprice_info : + { + "B0DSJGJBWV" : "19.81" # asin : 最低价 + } + """ print(f"【{self.mark_name}】，开始执行") num = 0 retry_num = 0 @@ -453,6 +583,24 @@ class AmzonePriceMatch(AmamzonBase): if len(current_price_ele) > 0: current_price = current_price_ele[0].attr("value") print("获取到当前价格为 ->",current_price) + # 如果紫鸟里当前价格低于最低价则删除，否则跳过 + if mode == "status" and miniprice_info.get(asin): + backend_price = float(miniprice_info.get(asin)) + if float(current_price) < backend_price: + yield (asin, { + "statu": "删除(当前价格低于最低价)", + "deleteSkipAsin": True, + "removeAsin": asin, + }) + continue + else: + yield (asin, { + "statu": "跳过(当前价格不低于最低价)", + "deleteSkipAsin": True, + "removeAsin": asin, + }) + continue + else: print(f"{self.mark_name} 没有获取到当前价格") yield (asin, { @@ -476,10 +624,16 @@ class AmzonePriceMatch(AmamzonBase): time.sleep(1) pass chrome = ChromeAmzone(tab=new_tab) - front_end_data = chrome.run() + front_end_data = chrome.run(country=current_country) chrome.close() print(self.mark_name,"亚马逊前台抓取到数据",front_end_data) - # + if front_end_data is None or len(front_end_data.get("top_sellers")) == 0: + yield (asin, { + "statu": "失败(第一名获取失败，请检查卖家精灵是否启用)", + "currentPrice": current_price, + }) + continue + cart_seller = front_end_data.get("cart_seller") if cart_seller == current_shop_name and len(front_end_data.get("top_sellers"))< 2: yield (asin, { @@ -769,6 +923,8 @@ class PriceTask: shopMallName = shop_item.get("shopMallName","") skip_asins_by_country = shop_item.get("skip_asins_by_country",{}) asin_rows_by_country = shop_item.get("asin_rows_by_country",{}) + skip_asin_details_by_country = shop_item.get("skip_asin_details_by_country",{}) + mode = shop_item.get("mode") if not company_name: self.log(f"店铺 {shop_name} 的公司名称为空，跳过", "WARNING") @@ -785,56 +941,61 @@ class PriceTask: # 店铺打开重试最多3次 driver = None max_retries = 3 + iskill = False + # 处理每个国家 + for country_code in country_codes: + # 打开店铺 + driver = self.open_shop(max_retries=max_retries, company_name=company_name, + shop_name=shop_name,iskill=iskill) + if driver is None: + self.log(f"任务 {task_id} 启动店铺失败，结束任务", "ERROR") + for country_code in country_codes: + self.post_result(task_id, shop_name, country_code, "", {}, shopMallName, is_done=True) + return - # 打开店铺 - driver = self.open_shop(max_retries=max_retries,company_name=company_name,shop_name=shop_name) - if driver is None: - self.log(f"任务 {task_id} 启动店铺失败，结束任务", "ERROR") - for country_code in country_codes: - self.post_result(task_id, shop_name, country_code, "", {}, shopMallName, is_done=True) - 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 - skip_asin = skip_asins_by_country.get(country_code,[]) #需要跳过的asin - appoint_asin = asin_rows_by_country.get(country_code,[]) - try: - self.process_country(driver, country_code, task_id, shop_name, risk_listing_filter, - shopMallName=shopMallName,skip_asin=skip_asin, limit=limit,appoint_asin=appoint_asin) - except Exception as e: - import traceback - self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR") - self.log(traceback.format_exc(), "ERROR") - # 最后回传，标记完成 + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理国家", "WARNING") + break + skip_asin = skip_asins_by_country.get(country_code,[]) #需要跳过的asin + appoint_asin = asin_rows_by_country.get(country_code,[]) + miniprice_info = {i.get('asin'):i.get('minimumPrice') for i in skip_asin_details_by_country.get(country_code,[])} 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, "", {},shopMallName,is_done=True) - else: - self.post_stage_finished(task_id, user_id, stage_index) + self.process_country(driver, country_code, task_id, shop_name, risk_listing_filter, + shopMallName=shopMallName,skip_asin=skip_asin, limit=limit, + appoint_asin=appoint_asin,mode=mode,miniprice_info=miniprice_info) except Exception as e: - self.log(f"回传结果失败: {str(e)}", "ERROR") - finally: + import traceback + self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + if "与页面的连接已断开" in e: + iskill = True + # 更新已处理国家数 + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + # 关闭店铺 - try: - if driver: - self.log(f"关闭店铺 {shop_name}") - driver.close_store() - time.sleep(2) - except Exception as e: - self.log(f"关闭店铺失败: {str(e)}", "WARNING") + driver.close_store() + + # 最后回传，标记完成 + 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, "", {},shopMallName,is_done=True) + else: + self.post_stage_finished(task_id, user_id, stage_index) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") - # 从正在执行中的店铺列表中移除 - if shop_name in runing_shop: - del runing_shop[shop_name] - self.log(f"店铺 {shop_name} 已从执行列表中移除") + # 从正在执行中的店铺列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + self.log(f"店铺 {shop_name} 已从执行列表中移除") def process_country(self, driver: AmzonePriceMatch, country_code: str, task_id: int, shop_name: str, - risk_listing_filter: str,shopMallName:str,skip_asin:list,appoint_asin:list,limit: str = None): + risk_listing_filter: str,shopMallName:str,skip_asin:list,appoint_asin:list,mode:str, + miniprice_info:dict={}, + limit: str = None): """处理单个国家的审批任务 Args: @@ -864,7 +1025,7 @@ class PriceTask: self.log(f"尝试切换到国家 {country_name} (第 {retry + 1}/{max_retries} 次)") if retry > 1: # 刷新不行就重新打开店铺 - self.log("重试前刷新页面...") + self.log("重试前重新打开店铺...") try: driver.close_store() time.sleep(3) @@ -946,49 +1107,41 @@ class PriceTask: self.log(f"国家 {country_name} 搜索出 {len(sku_ls)} 商品，开始处理...") # 处理所有需要审批的商品（通过yield获取结果） - try: - # 指定 asin - max_range = max(1,len(appoint_asin)) - for i in range(max_range): - if len(appoint_asin) > i: - _shopMallName = appoint_asin[i]["shopMallName"] - ap_asin = appoint_asin[i]["shopMallName"] - else: - _shopMallName = shopMallName - ap_asin = None - for asin, status in driver.run_page_action( - current_shop_name=_shopMallName, - appoint_asin=ap_asin,skip_asin=skip_asin - ): - # 检查是否收到暂停请求 - if task_id in runing_task and runing_task[task_id].get("stop_requested", False): - self.log(f"检测到任务 {task_id} 的暂停请求，停止处理ASIN", "WARNING") - break + # 指定 asin + max_range = max(1,len(appoint_asin)) + for i in range(max_range): + if len(appoint_asin) > i: + _shopMallName = appoint_asin[i]["shopMallName"] + ap_asin = appoint_asin[i]["shopMallName"] + else: + _shopMallName = shopMallName + ap_asin = None - self.log(f"ASIN {asin} 处理结果: {status}") + for asin, status in driver.run_page_action( + current_shop_name=_shopMallName, + appoint_asin=ap_asin,skip_asin=skip_asin,mode=mode, + miniprice_info=miniprice_info + ): + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理ASIN", "WARNING") + break - # 更新任务状态 - if task_id in runing_task: - runing_task[task_id]["current_asin"] = asin - runing_task[task_id]["processed_asins"] += 1 + self.log(f"ASIN {asin} 处理结果: {status}") - runing_task[task_id]["failed_count"] += 1 + # 更新任务状态 + if task_id in runing_task: + runing_task[task_id]["current_asin"] = asin + runing_task[task_id]["processed_asins"] += 1 - # 回传结果到API - try: - self.post_result(task_id, shop_name, country_code, asin, status,shopMallName) - except Exception as e: - self.log(f"回传结果失败: {str(e)}", "ERROR") + runing_task[task_id]["failed_count"] += 1 - 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 + # 回传结果到API + try: + self.post_result(task_id, shop_name, country_code, asin, status,shopMallName) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") self.log(f"国家 {country_name} 处理完成") @@ -1073,6 +1226,8 @@ class PriceTask: "secondPlace": status.get("secondPlace") if status.get("secondPlace") else "", "cartShopName": status.get("cartShopName") if status.get("cartShopName") else "", "priceChangeStatus": "UPDATED", + "deleteSkipAsin": status.get("deleteSkipAsin",False), + "removeAsin": status.get("removeAsin") if status.get("removeAsin") else "", # "modifyCount": "2", "status": status.get("statu") } diff --git a/app/web_source/admin.html b/app/web_source/admin.html new file mode 100644 index 0000000..ac8e238 --- /dev/null +++ b/app/web_source/admin.html @@ -0,0 +1,539 @@ + + + + + + 管理后台 - 数富AI + + + +
← 返回首页
+

管理后台

+ +
+
用户管理
+
查看生成记录
+
+ + +
+
+

创建用户

+

无注册入口，仅管理员可在此创建用户。层级：超级管理员 → 管理员 → 普通号。

+
+ + +
+
+ + +
+
+ + +
+ + +

+
+ +
+

用户列表

+
+
+ + +
+ + +
+ + + + + + + + + + + + +
ID用户名角色所属管理员创建时间操作
+ +
+
+ + +
+
+

筛选条件

+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+

生成记录

+ + + + + + + + + + + +
ID用户类型创建时间结果预览
+ +
+
+ + + + + + + diff --git a/app/web_source/brand - 副本.html b/app/web_source/brand - 副本.html new file mode 100644 index 0000000..b929e7e --- /dev/null +++ b/app/web_source/brand - 副本.html @@ -0,0 +1,1071 @@ + + + + + + 亚马逊 - 数富AI + + + +
+
+ 数富AI-亚马逊 + 返回首页 +
+ +
+
+ +
+ +
+ + +
+
+ 任务队列 + +
+
+
    +
    暂无任务
    +
    +
    +
    +
    + +
    + + + + diff --git a/app/web_source/brand-旧.html b/app/web_source/brand-旧.html new file mode 100644 index 0000000..871c8f7 --- /dev/null +++ b/app/web_source/brand-旧.html @@ -0,0 +1,1001 @@ + + + + + + 亚马逊 - 数富AI + + + +
    +
    + 数富AI-亚马逊 + 返回首页 +
    + +
    +
    + +
    + +
    + + +
    +
    + 任务队列 + +
    +
    +
      +
      暂无任务
      +
      +
      +
      +
      + +
      + + + + diff --git a/app/web_source/brand.html b/app/web_source/brand.html new file mode 100644 index 0000000..dc30af9 --- /dev/null +++ b/app/web_source/brand.html @@ -0,0 +1,1140 @@ + + + + + + 亚马逊 - 数富AI + + + +
      +
      + 数富AI-亚马逊 + 返回首页 +
      + +
      +
      + +
      + +
      + + +
      +
      + 任务队列 + +
      +
      +
        +
        暂无任务
        +
        +
        +
        +
        + +
        + + + + diff --git a/app/web_source/home.html b/app/web_source/home.html new file mode 100644 index 0000000..0aa04c9 --- /dev/null +++ b/app/web_source/home.html @@ -0,0 +1,364 @@ + + + + + + 首页 - 数富AI + + + +
        + 数富AI +
        + {% if is_admin %} + + {% endif %} + {{ username }} + + 退出 +
        +
        ↻ 软件更新
        +
        + 当前版本: {{ version }} + +
        +
        +
        + +
        +
        +
        +
        + +
        + 亚马逊 + wildberries + 图片 +
        + +
        + + + + diff --git a/app/web_source/index.html b/app/web_source/index.html new file mode 100644 index 0000000..ad863bb --- /dev/null +++ b/app/web_source/index.html @@ -0,0 +1,5833 @@ + + + + + + 数富AI + + + + +
        +
        + + 数富AI + ← 返回首页 + +
        + +
        + +
        +
        + +
        + + + + +
        +
        + + + + + +
        + +
        +
        +
        + +
        +
        生成或恢复到工作台的图片将显示在此处，点击可查看大图
        +
        +
        + +
        右侧显示所有图片竖向拼接后的效果，点击可查看大图并保存
        +
        + +
        + + +
        + + +
        +
        +
        + 设置 + +
        +
        +
        +
        ⚙ API Key
        +
        用于生成接口鉴权，必须设置后才能进行生成。仅保存在本机，不会上传。
        +
        + +
        +
        +
        +
        ↓ 自动保存位置
        +
        设置后，生图完成后将自动保存副本到此文件夹。
        +
        + + + +
        +
        +
        +
        ↻ 软件更新
        +
        + 当前版本: v1.0.0 + +
        +
        +
        + +
        +
        +
        +
        + +
        +
        +
        + + +
        +
        +
        选择参与拼接的图片及顺序（拖拽调整顺序，× 移出拼接）
        +
        +
        点击下方图片可加入拼接顺序：
        +
        +
        + + +
        +
        +
        + + + +
        + + +
        +
        +
        + +
        查看大图
        +
        +
        + + + +
        +
        + + + + + + + +
        +
        +
        + + +
        +
        +
        + +
        + +
        +
        +
        + + + 画笔: 20px + + + +
        +
        + *提示: 红色区域将被重新绘制
        + *提示: 点击图片添加标记,右键删除标记 +
        +
        + + +
        +
        + + +
        +
        +
        + + +
        +
        +
        +
        Just the Right Capacity, Easily Holds Daily Essentials.
        +
        Phone, long wallet, keys, lipstick—all fit in without looking bulky.
        +
        + +
        +
        +
        + + +
        + + +
        +
        + + +
        +
        + + + +
        +
        +
        +
        + + + + diff --git a/app/web_source/login.html b/app/web_source/login.html new file mode 100644 index 0000000..dc7cce7 --- /dev/null +++ b/app/web_source/login.html @@ -0,0 +1,180 @@ + + + + + + 登录 - 数富AI + + + +
        + 数富AI +
        + +
        +

        登录

        + {% if error %} +

        {{ error }}

        + {% endif %} +
        +
        + + +
        +
        + + +
        + +
        +
        + + +