payment 优化

src/payment.py

@@ -93,9 +93,9 @@ def invoice_details(invoice_number):
     page_get(full_url)
 
 
-def export_details_read_data(origin_invoice_number,invoice_number):
+def export_details_read_data(invoice_number):
     # # 读取详情内容
-    file_name = f"payment\\{origin_invoice_number}.csv"
+    file_name = f"payment\\{invoice_number}.csv"
     if os.path.isfile(file_name):
         return pd.read_csv(file_name)
 
@@ -198,7 +198,7 @@ def price_extract_data(html_content):
 
 def click_get_price_data(invoice_number):
     cache_key = "price_data"
-    cache_value = rdb.get_client().hget(cache_key,invoice_number)
+    cache_value = rdb.get_client().hget(cache_key, invoice_number)
     if cache_value:
         return json.loads(cache_value)
 
@@ -219,10 +219,10 @@ def click_get_price_data(invoice_number):
             log.warning("未获取到表数据")
             break
 
+
 def handle_price_data(price_data_list, invoice_amount):
     result = {}
-    invoice_amount = float(f"{invoice_amount:.2f}")
-
+    invoice_amount = abs(float(f"{invoice_amount:.2f}"))
     """处理争议数据"""
     for data_list in price_data_list:
         # 计算差异金额单价
@@ -281,8 +281,6 @@ def main():
         origin_invoice_number = data.get("Invoice Number")
         invoice_amount = data.get("Invoice Amount")
 
-
-
         invoice_number = origin_invoice_number
         # 获取当前订单的Payee和优惠比例
         vendor_payment_terms = get_po_code(i, invoice_number[:8])
@@ -296,13 +294,15 @@ def main():
         last_three = invoice_number[-3:]  # 取后三位
         if len(invoice_number) > 8:
             # 检查后两位是否在测试列表中
-            if last_two in ["PC", "MA", "SC"]:
+            if last_two in ["MA", "PC"]:
                 invoice_number = invoice_number[:-2]  # 去掉后两位
             if last_three in ["PCR", "+SC", "SC-"]:
                 invoice_number = invoice_number[:-3]  # 去掉最后三位
+            if last_two == "SC":
+                invoice_number = invoice_number + 'R'
 
         # 判断是否为争议订单
-        if last_three == "PCR":
+        if last_three == "PCR" or last_two == "PC":
             # 获取争议数据
             all_price_data = click_get_price_data(invoice_number)
             # 争议回款
@@ -311,7 +311,7 @@ def main():
             all_price_pay_data.append(pd.DataFrame(price_data, index=[0]))
         else:
             # 下载excel文件并读取数据
-            detail_data = export_details_read_data(origin_invoice_number,invoice_number)
+            detail_data = export_details_read_data(invoice_number)
             if detail_data is None:
                 log.error("数据存在问题,请手动处理")
                 continue