优化

invoices.py

@@ -60,7 +60,8 @@ def export_list_read_data():
     # 过滤符合条件的行
     filtered_second_df = second_df[second_df['Description'].str.contains(pattern, na=False, regex=True)]
 
-    merged_df = pd.merge(filtered_second_df, first_df[['Payment Number', 'Payment Date']], on='Payment Number',how='left')
+    merged_df = pd.merge(filtered_second_df, first_df[['Payment Number', 'Payment Date']], on='Payment Number',
+                         how='left')
 
     excel.save_xls(merged_df, new_file_name, "Remittance payments")
 
@@ -70,27 +71,28 @@ def export_list_read_data():
 def export_details_read_data(invoice_number):
     # 读取详情内容
     file_name = f"invoices\\{invoice_number}.csv"
+    if os.path.isfile(file_name):
+        return pd.read_csv(file_name)
 
-    try:
-        params = {
-            "invoiceNumber": invoice_number,
-            "payeeCode": "VECET",
-            "activeTab": "lineItems",
-        }
-        # 将字典转换为 URL 查询参数
-        query_string = urllib.parse.urlencode(params)
-        page.get(
-            f"https://vendorcentral.amazon.com/hz/vendor/members/inv-mgmt/invoice-details?" + query_string)
+    params = {
+        "invoiceNumber": invoice_number,
+        "payeeCode": "VECET",
+        "activeTab": "lineItems",
+    }
+    # 将字典转换为 URL 查询参数
+    query_string = urllib.parse.urlencode(params)
+    full_url = f"https://vendorcentral.amazon.com/hz/vendor/members/inv-mgmt/invoice-details?" + query_string
+    page.get(full_url, timeout=3)
 
-        if not os.path.isfile(file_name):
+    while True:
+        try:
             page.ele("#line-items-export-to-spreadsheet-announce", timeout=5).click.to_download(rename=file_name)
             file.wait_for_downloads(file_name)
             excel.remove_last_comma(file_name)
-
-    except ElementNotFoundError:
-        print("导出按钮不存在刷新网页")
-        page.refresh()
-        export_details_read_data(invoice_number)
+            break
+        except ElementNotFoundError:
+            print("导出按钮不存在刷新网页")
+            page.refresh()
 
     return pd.read_csv(file_name)
 

returns.py

 # coding: utf-8
 # 导出退款记录
 import os
-import time
 
 import pandas as pd
 from DrissionPage import ChromiumPage
@@ -24,29 +23,6 @@ helper.make_dir(download_path)
 page.set.download_path(download_path)
 
 
-def open_url(url):
-    # 访问网页
-    page.get(url, timeout=5)
-    time.sleep(1)
-
-    element = page.ele('#ap_email', timeout=1)
-    if element:
-        page.ele('#ap_email').input(email)
-        page.ele('#continue').click()
-        page.ele('#ap_password').input(password)
-        page.ele('#signInSubmit').click()
-
-    # 判断是否有图形码
-    while True:
-        time.sleep(1)
-
-        if not page.ele('.a-section a-text-center cvf-captcha-img'):
-            break
-
-        print("请填入图形码内容")
-        # todo 识别图形码
-
-
 def sku_relations():
     relations_dict = {}
     # 读取ASIN和sku映射关系
@@ -67,7 +43,7 @@ def export_list_read_data():
     if not os.path.isfile(file_name):
         # raise FileNotFoundError(f"{file_name},文件不存在")
         # 访问网页
-        open_url("https://vendorcentral.amazon.com/hz/vendor/members/returns?ref_=vc_xx_subNav")
+        page.get("https://vendorcentral.amazon.com/hz/vendor/members/returns?ref_=vc_xx_subNav", timeout=3)
         # 导出退货单
         page.ele("#file-download-button").click.to_download()
         file.wait_for_downloads(file_name)
@@ -81,7 +57,7 @@ def export_item_read_data(return_id):
         while True:
             try:
                 # 打开退回详情下载明细
-                open_url(f"https://vendorcentral.amazon.com/katalmonsapp/vendor/members/returns/{return_id}")
+                page.get(f"https://vendorcentral.amazon.com/katalmonsapp/vendor/members/returns/{return_id}", timeout=3)
                 page.ele("#file-download-button").click.to_download(rename=file_name)
                 file.wait_for_downloads(file_name)
                 break