ODS 完成

etl_billiards/tasks/payments_dwd_task.py

@@ -20,16 +20,17 @@ class PaymentsDwdTask(BaseDwdTask):
         window_start, window_end, _ = self._get_time_window()
         self.logger.info(f"Processing window: {window_start} to {window_end}")
 
-        loader = PaymentLoader(self.db)
+        loader = PaymentLoader(self.db, logger=self.logger)
         store_id = self.config.get("app.store_id")
 
         total_inserted = 0
-        total_errors = 0
+        total_updated = 0
+        total_skipped = 0
 
         # Iterate ODS Data
         batches = self.iter_ods_rows(
-            table_name="billiards_ods.ods_payment",
-            columns=["store_id", "pay_id", "payload", "fetched_at"],
+            table_name="billiards_ods.ods_payment_record",
+            columns=["site_id", "pay_id", "payload", "fetched_at"],
             start_time=window_start,
             end_time=window_end
         )
@@ -49,20 +50,30 @@ class PaymentsDwdTask(BaseDwdTask):
                     parsed_rows.append(parsed)
             
             if parsed_rows:
-                inserted, errors = loader.upsert_payments(parsed_rows, store_id)
+                inserted, updated, skipped = loader.upsert_payments(parsed_rows, store_id)
                 total_inserted += inserted
-                total_errors += errors
+                total_updated += updated
+                total_skipped += skipped
 
         self.db.commit()
         
-        self.logger.info(f"Task {self.get_task_code()} completed. Inserted: {total_inserted}, Errors: {total_errors}")
+        self.logger.info(
+            "Task %s completed. inserted=%s updated=%s skipped=%s",
+            self.get_task_code(),
+            total_inserted,
+            total_updated,
+            total_skipped,
+        )
         
         return {
-            "status": "success",
-            "inserted": total_inserted,
-            "errors": total_errors,
-            "window_start": window_start.isoformat(),
-            "window_end": window_end.isoformat()
+            "status": "SUCCESS",
+            "counts": {
+                "inserted": total_inserted,
+                "updated": total_updated,
+                "skipped": total_skipped,
+            },
+            "window_start": window_start,
+            "window_end": window_end,
         }
 
     def _parse_payment(self, raw: dict, store_id: int) -> dict:
@@ -89,6 +100,7 @@ class PaymentsDwdTask(BaseDwdTask):
             return {
                 "store_id": store_id,
                 "pay_id": pay_id,
+                "order_id": TypeParser.parse_int(raw.get("orderId") or raw.get("order_id")),
                 "order_settle_id": order_settle_id,
                 "order_trade_no": order_trade_no,
                 "relate_type": relate_type,
@@ -114,9 +126,11 @@ class PaymentsDwdTask(BaseDwdTask):
                     or raw.get("discount_amount")
                 ),
                 "payment_method": str(raw.get("paymentMethod") or raw.get("payment_method") or ""),
+                "pay_type": raw.get("payType") or raw.get("pay_type"),
                 "online_pay_channel": raw.get("onlinePayChannel") or raw.get("online_pay_channel"),
                 "pay_terminal": raw.get("payTerminal") or raw.get("pay_terminal"),
                 "pay_status": str(raw.get("payStatus") or raw.get("pay_status") or ""),
+                "remark": raw.get("remark"),
                 "raw_data": json.dumps(raw, ensure_ascii=False)
             }
         except Exception as e: