From 04c87306f0ddb63347dd9efabec5d8f5b493e27e Mon Sep 17 00:00:00 2001
From: BXY0414 <1079823339@qq.com>
Date: Thu, 4 Jun 2026 10:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=A4=A9=E7=8C=AB?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=9A=84=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project_bitable_common.py | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/project_bitable_common.py b/project_bitable_common.py
index d957c55..b0b2f43 100644
--- a/project_bitable_common.py
+++ b/project_bitable_common.py
@@ -218,10 +218,25 @@ base_data AS (
       AND f.完结时间 < %(end_ts_exclusive)s
 ),
 
-recharge_orders AS (
-    SELECT DISTINCT 平台订单号, 店铺主键
-    FROM analytics_layer.fact_sales
-    WHERE 业务模式 = '充值购物金'
+sales_order_flag AS (
+    SELECT
+        fs.平台订单号,
+        fs.店铺主键,
+        TRUE AS 订单存在于销售表,
+        BOOL_OR(fs.业务模式 = '充值购物金') AS 是否充值购物金订单
+    FROM analytics_layer.fact_sales fs
+    INNER JOIN (
+        SELECT DISTINCT
+            平台订单号,
+            店铺主键
+        FROM base_data
+        WHERE 店铺主键 IN (5,11,14,22,26)
+    ) r
+        ON fs.平台订单号 = r.平台订单号
+       AND fs.店铺主键 = r.店铺主键
+    GROUP BY
+        fs.平台订单号,
+        fs.店铺主键
 ),
 
 brand_split AS (
@@ -303,10 +318,14 @@ union_data AS (
         r.原始店铺名称 || '_权益金' AS 店铺名称,
         SUM(r.退款金额) AS 总退款金额
     FROM base_data r
-    JOIN recharge_orders ro
-      ON r.平台订单号 = ro.平台订单号
-     AND r.店铺主键 = ro.店铺主键
+    LEFT JOIN sales_order_flag sof
+      ON r.平台订单号 = sof.平台订单号
+     AND r.店铺主键 = sof.店铺主键
     WHERE r.店铺主键 IN (5,11,14,22,26)
+      AND (
+            sof.订单存在于销售表 IS NULL
+            OR sof.是否充值购物金订单 = TRUE
+          )
     GROUP BY 1,2
 
     UNION ALL