diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqReportService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqReportService.cs index 49aa29c..ba5ec9e 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqReportService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqReportService.cs @@ -754,7 +754,7 @@ namespace NCC.Extend object billingParameters; if (input.StoreIds != null && input.StoreIds.Any()) { - billingSql += " AND kd.F_StoreId IN @storeIds"; + billingSql += " AND kd.djmd IN @storeIds"; billingParameters = new { startTime, endTime, storeIds = input.StoreIds }; } else @@ -779,7 +779,7 @@ namespace NCC.Extend object consumeParameters; if (input.StoreIds != null && input.StoreIds.Any()) { - consumeSql += " AND xh.F_StoreId IN @storeIds"; + consumeSql += " AND xh.md IN @storeIds"; consumeParameters = new { startTime, endTime, storeIds = input.StoreIds }; } else @@ -804,7 +804,7 @@ namespace NCC.Extend object refundParameters; if (input.StoreIds != null && input.StoreIds.Any()) { - refundSql += " AND hytk.F_StoreId IN @storeIds"; + refundSql += " AND hytk.md IN @storeIds"; refundParameters = new { startTime, endTime, storeIds = input.StoreIds }; } else @@ -932,6 +932,7 @@ namespace NCC.Extend var endTime = input.EndTime ?? DateTime.Now; // 第一步:获取客户类型统计 + // 注意:lq_khxx表没有门店字段,无法按门店过滤 var customerTypeSql = $@" SELECT SUM(CASE WHEN kh.khlx = '{MemberTypeEnum.线索.GetHashCode()}' THEN 1 ELSE 0 END) as lead_count, @@ -942,16 +943,7 @@ namespace NCC.Extend WHERE kh.F_CreateTime >= @startTime AND kh.F_CreateTime <= @endTime"; - object customerTypeParameters; - if (input.StoreIds != null && input.StoreIds.Any()) - { - customerTypeSql += " AND kh.F_StoreId IN @storeIds"; - customerTypeParameters = new { startTime, endTime, storeIds = input.StoreIds }; - } - else - { - customerTypeParameters = new { startTime, endTime }; - } + object customerTypeParameters = new { startTime, endTime }; var customerTypeResult = await _db.Ado.SqlQueryAsync(customerTypeSql, customerTypeParameters); var leadCount = Convert.ToInt32(customerTypeResult?.FirstOrDefault()?.lead_count ?? 0); @@ -992,7 +984,7 @@ namespace NCC.Extend object consumeParameters; if (input.StoreIds != null && input.StoreIds.Any()) { - consumeSql += " AND xh.F_StoreId IN @storeIds"; + consumeSql += " AND xh.md IN @storeIds"; consumeParameters = new { startTime, endTime, storeIds = input.StoreIds }; } else