root/Neo-ZQYY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微信小程序页面迁移校验之前 P5任务处理之前

Browse Source
This commit is contained in:
Neo
2026-03-09 01:19:21 +08:00
parent 263bf96035
commit 6e20987d2f
1112 changed files with 153824 additions and 219694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/etl/connectors/feiqiu/tasks/utility/dws_build_order_summary_task.py
View File

@@ -24,7 +24,8 @@ WITH base AS (
COALESCE(sh.member_discount_amount, 0) AS member_discount_amount,
COALESCE(sh.adjust_amount, 0) AS manual_discount_amount,
COALESCE(sh.pay_amount, 0) AS total_paid_amount,
COALESCE(sh.balance_amount, 0) + COALESCE(sh.recharge_card_amount, 0) + COALESCE(sh.gift_card_amount, 0) AS stored_card_deduct,
-- balance_amount = recharge_card_amount + gift_card_amount（恒等式），不可三者相加
COALESCE(sh.balance_amount, 0) AS stored_card_deduct,
COALESCE(sh.coupon_amount, 0) AS total_coupon_deduction,
COALESCE(sh.table_charge_money, 0) AS settle_table_fee_amount,
COALESCE(sh.assistant_pd_money, 0) + COALESCE(sh.assistant_cx_money, 0) AS settle_assistant_service_amount,

2
apps/etl/connectors/feiqiu/tasks/utility/manual_ingest_task.py
View File

@@ -22,7 +22,6 @@ class ManualIngestTask(BaseTask):
(("member_stored_value_cards",), "ods.member_stored_value_cards"),
(("recharge_settlements",), "ods.recharge_settlements"),
(("settlement_records",), "ods.settlement_records"),
(("assistant_cancellation_records",), "ods.assistant_cancellation_records"),
(("assistant_accounts_master",), "ods.assistant_accounts_master"),
(("assistant_service_records",), "ods.assistant_service_records"),
(("site_tables_master",), "ods.site_tables_master"),
@@ -47,7 +46,6 @@ class ManualIngestTask(BaseTask):
"ods.member_stored_value_cards": {"pk": "id"},
"ods.recharge_settlements": {"pk": "id"},
"ods.settlement_records": {"pk": "id"},
"ods.assistant_cancellation_records": {"pk": "id", "json_cols": ["siteProfile"]},
"ods.assistant_accounts_master": {"pk": "id"},
"ods.assistant_service_records": {"pk": "id", "json_cols": ["siteProfile"]},
"ods.site_tables_master": {"pk": "id"},