队列消息

src/helper/excel.py

@@ -4,7 +4,7 @@ import re
 import pandas as pd
 from openpyxl.reader.excel import load_workbook
 
-def save_xls(data, output_file, sheet_name='Sheet1', adjusted=True):
+def save_xls(data, output_file, sheet_name='Sheet1', adjusted=False):
     try:
         # 如果文件已存在，则追加新的 sheet
         with pd.ExcelWriter(output_file, engine='openpyxl', mode='a', if_sheet_exists='replace') as writer:

src/helper/rabbitmq.py

@@ -51,8 +51,18 @@ class RabbitMQClient:
             if exchange:
                 self.channel.exchange_declare(exchange=exchange, exchange_type=exchange_type, durable=True)
 
+            # 死信交换机和路由键配置
+            dead_letter_exchange = "dead_letter_exchange"  # 死信交换机名称
+            dead_letter_routing_key = "dead_letter"  # 死信路由键
+
+            # 队列声明的参数
+            queue_arguments = {
+                "x-dead-letter-exchange": dead_letter_exchange,  # 设置死信交换机
+                "x-dead-letter-routing-key": dead_letter_routing_key,  # 设置死信路由键
+            }
+
             # 声明队列
-            self.channel.queue_declare(queue=queue, durable=True)
+            self.channel.queue_declare(queue=queue, durable=True,arguments=queue_arguments)
 
             # 绑定队列到交换机（如果有）
             if exchange:

src/payment.py

@@ -398,11 +398,11 @@ def main():
     if all_normal_pay_data:
         # 将所有数据合并为一个 DataFrame
         normal_pay_summary = pd.concat(all_normal_pay_data, ignore_index=True)
-        excel.save_xls(normal_pay_summary, new_file_name, "正常回款导出明细",False)
+        excel.save_xls(normal_pay_summary, new_file_name, "正常回款导出明细")
 
     if all_price_pay_data:
         price_pay_summary = pd.concat(all_price_pay_data, ignore_index=True)
-        excel.save_xls(price_pay_summary, new_file_name, "Price导出明细",False)
+        excel.save_xls(price_pay_summary, new_file_name, "Price导出明细")
 
 
 if __name__ == '__main__':

src/return_goods.py

@@ -137,9 +137,6 @@ if __name__ == '__main__':
     try:
         country = helper.get_input_with_default("国家(目前支持[DE,FR,JP,CA,UK,US])", "US")
         shop_code = helper.get_input_with_default("店铺编码", "US-VC")
-        if shop_code == "":
-            raise Exception("店铺编码不能为空")
-
         domain.domain_page(page, country)
         main()
         page.close()

src/spa_search.py

@@ -308,16 +308,23 @@ def save_excel(sheet_data, large_sheet_data, new_file_name):
 
 def push_data_queue(file_name):
     rabbit = rabbitmq.RabbitMQClient(host='172.18.218.11', port=15672, username='test', password='khd123456')
-    rabbit.connect(queue='return_robot', routing_key='return_robot', exchange='reports')
-    log.info("开始推送消息....")
+    rabbit.connect(queue='spa_robot', routing_key='spa_robot', exchange='reports')
+    log.info("开始读取数据....")
     data_dict = pd.read_excel(file_name, sheet_name=None)
+    log.info("开始推送消息....")
     for sheet_name, values in data_dict.items():
         for _, item_row in values.iterrows():
-            parent_id = "Sheet1"
-            if sheet_name != "Sheet1":
+            if sheet_name == "Sheet1":
                 parent_id = item_row.get('Invoice ID', "")
+            else:
+                parent_id = sheet_name
+
+            order_data = item_row.get('Order Date', "")
+            if order_data == "":
+                order_data = item_row.get('Receive Date', "")
+
             push_data = {
-                'ad_date': item_row.get('Order Date', ""),  # spa费用数据日期
+                'ad_date': order_data,  # spa费用数据日期
                 'erp_sku': item_row.get('ERP SKU', ""),  # ERP SKU
                 'ad_amount': item_row.get('Original balance', ""),  # spa费用金额
                 'ad_amount_currency': item_row.get('Agreement Currency', ""),  # spa费用币制