ODS 完成

etl_billiards/loaders/base_loader.py

@@ -1,19 +1,23 @@
 # -*- coding: utf-8 -*-
 """数据加载器基类"""
 
+import logging
+
+
 class BaseLoader:
     """数据加载器基类"""
-    
-    def __init__(self, db_ops):
+
+    def __init__(self, db_ops, logger=None):
         self.db = db_ops
-    
+        self.logger = logger or logging.getLogger(self.__class__.__name__)
+
     def upsert(self, records: list) -> tuple:
         """
-        执行UPSERT操作
+        执行 UPSERT 操作
         返回: (inserted_count, updated_count, skipped_count)
         """
         raise NotImplementedError("子类需实现 upsert 方法")
-    
+
     def _batch_size(self) -> int:
         """批次大小"""
         return 1000

etl_billiards/loaders/facts/payment.py

@@ -12,28 +12,33 @@ class PaymentLoader(BaseLoader):
         
         sql = """
         INSERT INTO billiards.fact_payment (
-            store_id, pay_id, site_id, tenant_id,
+            store_id, pay_id, order_id,
+            site_id, tenant_id,
             order_settle_id, order_trade_no,
             relate_type, relate_id,
             create_time, pay_time,
             pay_amount, fee_amount, discount_amount,
-            payment_method, online_pay_channel, pay_terminal,
-            pay_status, raw_data
+            payment_method, pay_type,
+            online_pay_channel, pay_terminal,
+            pay_status, remark, raw_data
         )
         VALUES (
-            %(store_id)s, %(pay_id)s, %(site_id)s, %(tenant_id)s,
+            %(store_id)s, %(pay_id)s, %(order_id)s,
+            %(site_id)s, %(tenant_id)s,
             %(order_settle_id)s, %(order_trade_no)s,
             %(relate_type)s, %(relate_id)s,
             %(create_time)s, %(pay_time)s,
             %(pay_amount)s, %(fee_amount)s, %(discount_amount)s,
-            %(payment_method)s, %(online_pay_channel)s, %(pay_terminal)s,
-            %(pay_status)s, %(raw_data)s
+            %(payment_method)s, %(pay_type)s,
+            %(online_pay_channel)s, %(pay_terminal)s,
+            %(pay_status)s, %(remark)s, %(raw_data)s
         )
         ON CONFLICT (store_id, pay_id) DO UPDATE SET
             order_settle_id = EXCLUDED.order_settle_id,
             order_trade_no = EXCLUDED.order_trade_no,
             relate_type = EXCLUDED.relate_type,
             relate_id = EXCLUDED.relate_id,
+            order_id = EXCLUDED.order_id,
             site_id = EXCLUDED.site_id,
             tenant_id = EXCLUDED.tenant_id,
             create_time = EXCLUDED.create_time,
@@ -42,9 +47,11 @@ class PaymentLoader(BaseLoader):
             fee_amount = EXCLUDED.fee_amount,
             discount_amount = EXCLUDED.discount_amount,
             payment_method = EXCLUDED.payment_method,
+            pay_type = EXCLUDED.pay_type,
             online_pay_channel = EXCLUDED.online_pay_channel,
             pay_terminal = EXCLUDED.pay_terminal,
             pay_status = EXCLUDED.pay_status,
+            remark = EXCLUDED.remark,
             raw_data = EXCLUDED.raw_data,
             updated_at = now()
         RETURNING (xmax = 0) AS inserted