Commit 1946e4a7 authored by 邱阿朋's avatar 邱阿朋

feat(payment_erp): 更新平台应付金额处理逻辑

- 根据国家代码选择不同的应付金额字段:法国和英国使用 'Net Amount Paid',其他国家使用 'Invoice Amount'- 优化了支付数据的处理流程,提高了代码的可读性和灵活性

fix(spa_search):优化大数据列表处理函数

- 修改了 process_large_items 函数,增加了合作方信息参数
- 在处理大数据列表时添加了发票日期和资金类型字段,提高了数据的完整性
parent 306d49db
......@@ -107,13 +107,17 @@ def main():
payment_date = payments_map.get(payment_number, {}).get('Payment Date', '')
platform_payable_amount = data.get('Invoice Amount', '')
if country == 'FR' or country == 'UK':
platform_payable_amount = data.get('Net Amount Paid', '')
push_data = {
'payment_number': data.get('Payment Number', ''), # 订单id
'order_date': str(data.get('Invoice Date', '')), # 发票时间
'payment_date': str(payment_date),
'order_no': data.get('Invoice Number', 0), # 订单号
'payment_type': data.get('Description', ''), # Description
'platform_payable_amount': data.get('Invoice Amount', ''), # 平台应付金额
'platform_payable_amount': platform_payable_amount, # 平台应付金额
'fee_amount': data.get("Terms Discount Taken", ''), # 手续费
'actual_payment': data.get('Amount Paid', ''), # 实际支付金额
'currency': data.get('Invoice Currency', ''), # 货币
......@@ -130,7 +134,6 @@ if __name__ == '__main__':
shop_code = helper.get_input_with_default("店铺编码(DE-VC,FR-VC,JP-VC,CA-VC,UK-VC,VECELO])", "VECELO")
domain.domain_page(page, country)
main()
page.close()
except KeyboardInterrupt:
pass
except Exception as e:
......
......@@ -205,14 +205,14 @@ def main():
if len(item_dict) > 1:
for i, value in enumerate(item_dict.values(), start=1):
invoice_id_num = f"{invoice_id}-{i}"
processed_items = process_large_items(value, relation_data)
processed_items = process_large_items(value, relation_data,coop)
if processed_items:
large_sheet_data[invoice_id_num] = processed_items
else:
item_list = item_dict.get('Accrual For Current Period')
# 如果是列表且长度 >= 10 则新增sheet
if len(item_list) >= 10:
processed_items = process_large_items(item_list, relation_data)
processed_items = process_large_items(item_list, relation_data,coop)
if processed_items:
large_sheet_data[invoice_id] = processed_items
else:
......@@ -226,7 +226,7 @@ def main():
push_data_queue(new_file_name)
def process_large_items(item_list, relation_data):
def process_large_items(item_list, relation_data,coop):
"""处理大数据列表 (item_list 长度 >= 10)"""
processed_items = []
for _, item in item_list.iterrows():
......@@ -241,6 +241,8 @@ def process_large_items(item_list, relation_data):
processed_item = item.copy()
processed_item.pop("Title")
processed_item.pop("Asin")
processed_item["Invoice date"] = coop.get("Invoice date")
processed_item['Funding Type'] = coop.get("Funding Type")
processed_item['Asin'] = asin
processed_item['ERP SKU'] = relation.get("erp_sku")
processed_item['Group Name'] = relation.get("name")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment