Commit 769ed4ee036711db173994684b887514313df989

Authored by “wangming”
1 parent ff3b884a

fix: 开单统计通过F_ActivityId字段过滤营销活动

- 开单统计增加F_ActivityId条件过滤
- 只统计该营销活动关联的开单数据
- 退卡统计保持原逻辑(退卡表可能没有活动字段)
netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs
@@ -623,7 +623,7 @@ namespace NCC.Extend.LqPackageInfo @@ -623,7 +623,7 @@ namespace NCC.Extend.LqPackageInfo
623 storeFilterRefund = $"AND hytk.md IN ('{storeIdsStr}')"; 623 storeFilterRefund = $"AND hytk.md IN ('{storeIdsStr}')";
624 } 624 }
625 625
626 - // 4. 开单统计 - 直接从开单主表查询 626 + // 4. 开单统计 - 直接从开单主表查询,通过F_ActivityId过滤
627 var billingSql = $@" 627 var billingSql = $@"
628 SELECT 628 SELECT
629 COUNT(DISTINCT kd.F_Id) as billing_count, 629 COUNT(DISTINCT kd.F_Id) as billing_count,
@@ -631,6 +631,7 @@ namespace NCC.Extend.LqPackageInfo @@ -631,6 +631,7 @@ namespace NCC.Extend.LqPackageInfo
631 SUM(CAST(kd.qk AS DECIMAL(18,2))) as debt_amount 631 SUM(CAST(kd.qk AS DECIMAL(18,2))) as debt_amount
632 FROM lq_kd_kdjlb kd 632 FROM lq_kd_kdjlb kd
633 WHERE kd.F_IsEffective = 1 633 WHERE kd.F_IsEffective = 1
  634 + AND kd.F_ActivityId = '{input.ActivityId}'
634 AND kd.kdrq >= '{startTime:yyyy-MM-dd HH:mm:ss}' 635 AND kd.kdrq >= '{startTime:yyyy-MM-dd HH:mm:ss}'
635 AND kd.kdrq <= '{endTime:yyyy-MM-dd HH:mm:ss}' 636 AND kd.kdrq <= '{endTime:yyyy-MM-dd HH:mm:ss}'
636 {storeFilter}"; 637 {storeFilter}";