feat: 1. 拓客明细页面是否字段使用tag样式显示；2. 6个接口支持多门店筛选；3. 门店日报统计接口添加在职人数字段

- 拓客明细页面：是否邀约、是否预约、是否消耗、是否开卡字段使用el-tag样式，绿色表示是，灰色表示否 - 多门店筛选接口： * 会员品项接口：BillingStoreId改为支持BillingStoreIds数组 * 开单明细接口：StoreId改为支持StoreIds数组 * 耗卡明细接口：StoreId改为支持StoreIds数组 * 会员升单统计接口：新增StoreIds多门店筛选 * 储扣列表接口：StoreId改为支持StoreIds数组（已存在，优化逻辑） * 门店整体统计接口：StoreId改为支持StoreIds数组 - 门店日报统计接口：添加EmployeeCount在职人数字段，从lq_mdxx.zzrs获取

feat: 1. 拓客明细页面是否字段使用tag样式显示；2. 6个接口支持多门店筛选；3. 门店日报统计接口添加在职人数字段
- 拓客明细页面：是否邀约、是否预约、是否消耗、是否开卡字段使用el-tag样式，绿色表示是，灰色表示否 - 多门店筛选接口： * 会员品项接口：BillingStoreId改为支持BillingStoreIds数组 * 开单明细接口：StoreId改为支持StoreIds数组 * 耗卡明细接口：StoreId改为支持StoreIds数组 * 会员升单统计接口：新增StoreIds多门店筛选 * 储扣列表接口：StoreId改为支持StoreIds数组（已存在，优化逻辑） * 门店整体统计接口：StoreId改为支持StoreIds数组 - 门店日报统计接口：添加EmployeeCount在职人数字段，从lq_mdxx.zzrs获取
“wangming”
1 parent 430949ed
Showing 16 changed files with 209 additions and 24 deletions
antis-ncc-admin/.env.development
antis-ncc-admin/src/components/kpi-drill/tk-analysis.vue
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqDailyReport/StoreDailyStatisticsOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingItemDetailListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/HealthCoachStatisticsQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/MemberItemInfoQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/MemberUpgradeStatisticsListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqReportService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
 # 开发
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
+# VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
 # VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
-# VUE_APP_BASE_API = 'http://localhost:2011'
+VUE_APP_BASE_API = 'http://localhost:2011'
 # VUE_APP_BASE_API = 'http://localhost:2011'
 VUE_APP_IMG_API = ''
 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
@@ -43,7 +43,15 @@
             <el-table-column v-for="col in columns" :key="col.prop" :prop="col.prop" :label="col.label"
               :width="col.width" :min-width="col.minWidth">
               <template slot-scope="scope">
-                <span>{{ scope.row[col.prop] || '—' }}</span>
+                <!-- 是否类字段使用tag样式 -->
+                <el-tag 
+                  v-if="['hasInvite', 'hasAppointment', 'hasConsume', 'hasBilling'].includes(col.prop)"
+                  :type="scope.row[col.prop] === '是' ? 'success' : 'info'" 
+                  size="small">
+                  {{ scope.row[col.prop] || '否' }}
+                </el-tag>
+                <!-- 其他字段使用普通文本 -->
+                <span v-else>{{ scope.row[col.prop] || '—' }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -19,6 +19,11 @@ namespace NCC.Extend.Entitys.Dto.LqDailyReport
         public string StoreName { get; set; }
         /// <summary>
+        /// 在职人数
+        /// </summary>
+        public int EmployeeCount { get; set; }
+
+        /// <summary>
         /// 人头数（去重后的消费会员数）
         /// </summary>
         public int HeadCount { get; set; }
+using System.Collections.Generic;
 using NCC.Common.Filter;
 namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
@@ -78,9 +79,14 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public string SourceType { get; set; }
         /// <summary>
-        /// 门店ID
+        /// 门店ID（单门店，兼容旧版本）
         /// </summary>
         public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店ID列表（多门店筛选）
+        /// </summary>
+        public List<string> StoreIds { get; set; }
     }
 }
-using NCC.Common.Filter;
 using System;
+using System.Collections.Generic;
+using NCC.Common.Filter;
 namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
 {
@@ -24,11 +25,16 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public string DepartmentId { get; set; }
         /// <summary>
-        /// 门店ID
+        /// 门店ID（单门店，兼容旧版本）
         /// </summary>
         public string StoreId { get; set; }
         /// <summary>
+        /// 门店ID列表（多门店筛选）
+        /// </summary>
+        public List<string> StoreIds { get; set; }
+
+        /// <summary>
         /// 健康师姓名
         /// </summary>
         public string EmployeeName { get; set; }
 using System;
+using System.Collections.Generic;
 using NCC.Common.Filter;
 namespace NCC.Extend.Entitys.Dto.LqKhxx
@@ -19,11 +20,16 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string BelongStoreId { get; set; }
         /// <summary>
-        /// 开单门店ID
+        /// 开单门店ID（单门店，兼容旧版本）
         /// </summary>
         public string BillingStoreId { get; set; }
         /// <summary>
+        /// 开单门店ID列表（多门店筛选）
+        /// </summary>
+        public List<string> BillingStoreIds { get; set; }
+
+        /// <summary>
         /// 会员类型
         /// </summary>
         public int MemberType { get; set; } = -1;
@@ -37,6 +37,11 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         /// 是否升生美（true-是，false-否，null-不筛选）
         /// </summary>
         public bool? HasUpgradeLifeBeauty { get; set; }
+
+        /// <summary>
+        /// 门店ID列表（多门店筛选）
+        /// </summary>
+        public List<string> StoreIds { get; set; }
     }
 }
@@ -117,5 +117,10 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb
         /// 是否开卡（是/否）
         /// </summary>
         public string hasBilling { get; set; }
+
+        /// <summary>
+        /// 会员ID（内部使用，不返回给前端）
+        /// </summary>
+        public string memberId { get; set; }
     }
 }
+using System.Collections.Generic;
 using NCC.Common.Filter;
 namespace NCC.Extend.Entitys.Dto.LqXhPxmx
@@ -73,9 +74,14 @@ namespace NCC.Extend.Entitys.Dto.LqXhPxmx
         public string SourceType { get; set; }
         /// <summary>
-        /// 门店ID
+        /// 门店ID（单门店，兼容旧版本）
         /// </summary>
         public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店ID列表（多门店筛选）
+        /// </summary>
+        public List<string> StoreIds { get; set; }
     }
 }
@@ -99,6 +99,7 @@ namespace NCC.Extend
         /// 返回说明：
         /// - StoreId: 门店ID
         /// - StoreName: 门店名称
+        /// - EmployeeCount: 在职人数
         /// - HeadCount: 人头数（去重后的消费会员数）
         /// - PersonCount: 人次（日度去重客户数，同一天同一客户只算一次）
         /// - ProjectCount: 项目数（消耗的项目总数，从品项明细表统计）
@@ -134,6 +135,8 @@ namespace NCC.Extend
                 SELECT 
                     consume.Md as StoreId,
                     MAX(store.dm) as StoreName,
+                    -- 在职人数（从门店表获取）
+                    MAX(COALESCE(store.zzrs, 0)) as EmployeeCount,
                     -- 人头数（去重后的消费会员数）
                     COALESCE(COUNT(DISTINCT consume.Hy), 0) as HeadCount,
                     -- 人次（日度去重客户数）
@@ -185,6 +188,7 @@ namespace NCC.Extend
             {
                 StoreId = item.StoreId,
                 StoreName = item.StoreName,
+                EmployeeCount = Convert.ToInt32(item.EmployeeCount ?? 0),
                 HeadCount = Convert.ToInt32(item.HeadCount),
                 PersonCount = Convert.ToInt32(item.PersonCount),
                 ProjectCount = Convert.ToInt32(item.ProjectCount),
@@ -3635,10 +3635,25 @@ namespace NCC.Extend.LqKdKdjlb
                     parameters.Add(new SugarParameter("@departmentId", input.DepartmentId));
                 }
-                if (!string.IsNullOrEmpty(input.StoreId))
+                // 处理多门店筛选：优先使用StoreIds，如果没有则使用StoreId
+                var storeIds = new List<string>();
+                if (input.StoreIds != null && input.StoreIds.Any())
                 {
-                    conditions.Add("u.F_MDID = @storeId");
-                    parameters.Add(new SugarParameter("@storeId", input.StoreId));
+                    storeIds = input.StoreIds.Where(x => !string.IsNullOrEmpty(x)).ToList();
+                }
+                else if (!string.IsNullOrEmpty(input.StoreId))
+                {
+                    storeIds = new List<string> { input.StoreId };
+                }
+
+                if (storeIds.Any())
+                {
+                    var storeIdParams = string.Join(",", storeIds.Select((_, i) => $"@storeId{i}"));
+                    conditions.Add($"u.F_MDID IN ({storeIdParams})");
+                    for (int i = 0; i < storeIds.Count; i++)
+                    {
+                        parameters.Add(new SugarParameter($"@storeId{i}", storeIds[i]));
+                    }
                 }
                 if (!string.IsNullOrEmpty(input.EmployeeName))
@@ -3839,9 +3854,20 @@ namespace NCC.Extend.LqKdKdjlb
                     .WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => pxmx.ItemCategory == input.ItemType);
                 // 2. 通过 EXISTS 子查询筛选关联字段（在分页前筛选，确保分页准确）
+                // 处理多门店筛选：优先使用StoreIds，如果没有则使用StoreId
+                var filterStoreIds = new List<string>();
+                if (input.StoreIds != null && input.StoreIds.Any())
+                {
+                    filterStoreIds = input.StoreIds.Where(x => !string.IsNullOrEmpty(x)).ToList();
+                }
+                else if (!string.IsNullOrEmpty(input.StoreId))
+                {
+                    filterStoreIds = new List<string> { input.StoreId };
+                }
+
                 baseQuery = baseQuery.WhereIF(!string.IsNullOrEmpty(input.MemberName), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Khmc != null && x.Khmc.Contains(input.MemberName)).Any())
                     .WhereIF(!string.IsNullOrEmpty(input.MemberPhone), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Sjh == input.MemberPhone).Any())
-                    .WhereIF(!string.IsNullOrEmpty(input.StoreId), pxmx => SqlFunc.Subqueryable<LqKdKdjlbEntity>().Where(x => x.Id == pxmx.Glkdbh && x.Djmd == input.StoreId).Any());
+                    .WhereIF(filterStoreIds.Any(), pxmx => SqlFunc.Subqueryable<LqKdKdjlbEntity>().Where(x => x.Id == pxmx.Glkdbh && filterStoreIds.Contains(x.Djmd)).Any());
                 // 3. 先分页查询主表数据（查询实体类，提高性能）
                 var pagedData = await baseQuery.OrderBy(sidx + " " + sort).ToPagedListAsync(input.currentPage, input.pageSize);
@@ -1145,7 +1145,18 @@ namespace NCC.Extend.LqKhxx
                 }
                 // 如果指定了开单门店、开单人、品项ID等条件，需要通过开单表进行筛选
-                if (!string.IsNullOrEmpty(input.BillingStoreId) ||
+                // 处理多门店筛选：优先使用BillingStoreIds，如果没有则使用BillingStoreId
+                var billingStoreIds = new List<string>();
+                if (input.BillingStoreIds != null && input.BillingStoreIds.Any())
+                {
+                    billingStoreIds = input.BillingStoreIds.Where(x => !string.IsNullOrEmpty(x)).ToList();
+                }
+                else if (!string.IsNullOrEmpty(input.BillingStoreId))
+                {
+                    billingStoreIds = new List<string> { input.BillingStoreId };
+                }
+
+                if (billingStoreIds.Any() ||
                     !string.IsNullOrEmpty(input.BillingUserId) ||
                     !string.IsNullOrEmpty(input.PurchaseItemId) ||
                     !string.IsNullOrEmpty(input.GiftItemId) ||
@@ -1155,9 +1166,9 @@ namespace NCC.Extend.LqKhxx
                     var billingQuery = _db.Queryable<LqKdKdjlbEntity>()
                         .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode());
-                    if (!string.IsNullOrEmpty(input.BillingStoreId))
+                    if (billingStoreIds.Any())
                     {
-                        billingQuery = billingQuery.Where(x => x.Djmd == input.BillingStoreId);
+                        billingQuery = billingQuery.Where(x => billingStoreIds.Contains(x.Djmd));
                     }
                     if (!string.IsNullOrEmpty(input.BillingUserId))
@@ -503,7 +503,7 @@ namespace NCC.Extend
         ///   - TopAmountMemberName: 开单金额最高会员姓名
         ///   - TopAmountValue: 该会员整月实付金额
         ///   - TopTimesMemberName: 开单次数最多会员姓名
-        ///   - TopTimesCount: 该会员整月开单次数
+        ///   - TopTimesCount: 该会员整月开单次数（按天去重，同一天多次开单只算一次）
         ///   - DebtTotal: 整月欠款总额（sfyj+ck金额以外的qk累加）
         ///   - TopDebtMemberName: 欠款最多会员姓名
         ///   - TopDebtValue: 欠款最多会员的欠款金额
@@ -598,15 +598,16 @@ namespace NCC.Extend
                     .OrderBy(x => x.Date)
                     .ToList();
-                // 3. 会员极值：按会员聚合金额和次数
+                // 3. 会员极值：按会员聚合金额和次数（开单次数按天去重）
                 var memberAgg = rawList
-                    .Where(x => !string.IsNullOrEmpty(x.MemberId))
-                    .GroupBy(x => x.MemberId)
+                    .Where(x => !string.IsNullOrEmpty(x.MemberId) && x.BillingDate.HasValue)
+                    .GroupBy(x => new { x.MemberId, Date = x.BillingDate.Value.Date })
+                    .GroupBy(g => g.Key.MemberId)
                     .Select(g => new
                     {
                         MemberId = g.Key,
-                        Amount = g.Sum(x => x.Amount),
-                        Times = g.Count()
+                        Amount = g.SelectMany(dayGroup => dayGroup).Sum(x => x.Amount),
+                        Times = g.Count() // 按天去重后的开单天数
                     })
                     .ToList();
@@ -4898,6 +4898,7 @@ namespace NCC.Extend.LqStatistics
                     ) xh_stats ON xh_stats.member_id = tk.F_MemberId
                     -- 开单统计子查询（只统计通过预约产生的开单，包含金额和品项）
                     -- 通过会员ID关联：线索池 -> 邀约 -> 预约 -> 开单（通过预约ID，且会员ID匹配）
+                    -- 注意：剔除品项ID是61且金额是0的记录
                     LEFT JOIN (
                         SELECT 
                             tk_inner.F_MemberId as member_id,
@@ -4908,7 +4909,14 @@ namespace NCC.Extend.LqStatistics
                         INNER JOIN lq_yaoyjl yaoy ON yaoy.yykh = tk_inner.F_MemberId
                         INNER JOIN lq_yyjl yy ON yy.F_InviteId = yaoy.F_Id AND yy.gk = tk_inner.F_MemberId
                         INNER JOIN lq_kd_kdjlb kd ON kd.F_AppointmentId = yy.F_Id AND kd.kdhy = tk_inner.F_MemberId AND kd.F_IsEffective = 1
+                        INNER JOIN (
+                            SELECT DISTINCT glkdbh
+                            FROM lq_kd_pxmx
+                            WHERE F_IsEffective = 1
+                                AND NOT (px = '61' AND (COALESCE(F_ActualPrice, 0) = 0 AND COALESCE(F_TotalPrice, 0) = 0))
+                        ) valid_px ON valid_px.glkdbh = kd.F_Id
                         LEFT JOIN lq_kd_pxmx kdpx ON kdpx.glkdbh = kd.F_Id AND kdpx.F_IsEffective = 1
+                            AND NOT (kdpx.px = '61' AND (COALESCE(kdpx.F_ActualPrice, 0) = 0 AND COALESCE(kdpx.F_TotalPrice, 0) = 0))
                         GROUP BY tk_inner.F_MemberId
                     ) kd_stats ON kd_stats.member_id = tk.F_MemberId
                     -- 实际预约记录数统计（不管是否通过邀约产生）
@@ -5229,6 +5237,7 @@ namespace NCC.Extend.LqStatistics
                     ) xh_stats ON xh_stats.member_id = tk.F_MemberId
                     -- 开单统计子查询（只统计通过预约产生的开单，包含金额和品项）
                     -- 通过会员ID关联：线索池 -> 邀约 -> 预约 -> 开单（通过预约ID，且会员ID匹配）
+                    -- 注意：剔除品项ID是61且金额是0的记录
                     LEFT JOIN (
                         SELECT 
                             tk_inner.F_MemberId as member_id,
@@ -5239,7 +5248,14 @@ namespace NCC.Extend.LqStatistics
                         INNER JOIN lq_yaoyjl yaoy ON yaoy.yykh = tk_inner.F_MemberId
                         INNER JOIN lq_yyjl yy ON yy.F_InviteId = yaoy.F_Id AND yy.gk = tk_inner.F_MemberId
                         INNER JOIN lq_kd_kdjlb kd ON kd.F_AppointmentId = yy.F_Id AND kd.kdhy = tk_inner.F_MemberId AND kd.F_IsEffective = 1
+                        INNER JOIN (
+                            SELECT DISTINCT glkdbh
+                            FROM lq_kd_pxmx
+                            WHERE F_IsEffective = 1
+                                AND NOT (px = '61' AND (COALESCE(F_ActualPrice, 0) = 0 AND COALESCE(F_TotalPrice, 0) = 0))
+                        ) valid_px ON valid_px.glkdbh = kd.F_Id
                         LEFT JOIN lq_kd_pxmx kdpx ON kdpx.glkdbh = kd.F_Id AND kdpx.F_IsEffective = 1
+                            AND NOT (kdpx.px = '61' AND (COALESCE(kdpx.F_ActualPrice, 0) = 0 AND COALESCE(kdpx.F_TotalPrice, 0) = 0))
                         GROUP BY tk_inner.F_MemberId
                     ) kd_stats ON kd_stats.member_id = tk.F_MemberId
                     -- 实际预约记录数统计（不管是否通过邀约产生）
@@ -5703,6 +5719,17 @@ namespace NCC.Extend.LqStatistics
                     }
                 }
+                // 添加多门店筛选
+                if (input.StoreIds != null && input.StoreIds.Any())
+                {
+                    var storeIdParams = string.Join(",", input.StoreIds.Select((_, i) => $"@StoreId{i}"));
+                    whereConditions.Add($"kd.Djmd IN ({storeIdParams})");
+                    for (int i = 0; i < input.StoreIds.Count; i++)
+                    {
+                        parameters.Add(new SugarParameter($"@StoreId{i}", input.StoreIds[i]));
+                    }
+                }
+
                 var whereClause = whereConditions.Any() ? "AND " + string.Join(" AND ", whereConditions) : "";
                 // 构建HAVING条件（用于筛选升单条件）
@@ -147,12 +147,70 @@ namespace NCC.Extend.LqTkjlb
                     hasAppointment = SqlFunc.Subqueryable<LqYyjlEntity>().Where(y => y.Gk == it.MemberId).Any() ? "是" : "否",
                     // 是否消耗：通过会员ID关联耗卡表（hy字段存储的是会员ID）
                     hasConsume = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(x => x.Hy == it.MemberId).Any() ? "是" : "否",
-                    // 是否开卡：通过会员ID关联开单表（kdhy字段存储的是会员ID）
-                    hasBilling = SqlFunc.Subqueryable<LqKdKdjlbEntity>().Where(k => k.Kdhy == it.MemberId).Any() ? "是" : "否"
+                    // 是否开卡：通过会员ID关联开单表（kdhy字段存储的是会员ID），剔除品项ID是61（女神卡）且金额是0的记录
+                    // 先设置为否，后面在内存中处理
+                    hasBilling = "否"
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
                 .ToPagedListAsync(input.currentPage, input.pageSize);
+
+            // 批量查询有有效开单的会员ID（剔除品项ID是61且金额是0的记录）
+            // 先查询所有拓客记录的会员ID
+            var tkIds = data.list?.Select(x => x.id).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList() ?? new List<string>();
+            var memberIdDict = new Dictionary<string, string>(); // tkId -> MemberId
+            
+            if (tkIds.Any())
+            {
+                // 查询拓客记录的会员ID
+                var tkMembers = await _db.Queryable<LqTkjlbEntity>()
+                    .Where(x => tkIds.Contains(x.Id))
+                    .Select(x => new { x.Id, x.MemberId })
+                    .ToListAsync();
+                memberIdDict = tkMembers?.Where(x => !string.IsNullOrEmpty(x.MemberId))
+                    .ToDictionary(x => x.Id, x => x.MemberId) ?? new Dictionary<string, string>();
+            }
+            
+            var memberIds = memberIdDict.Values.Distinct().ToList();
+            var hasBillingMemberIds = new HashSet<string>();
+            
+            if (memberIds.Any())
+            {
+                var sql = $@"
+                    SELECT DISTINCT kd.kdhy as MemberId
+                    FROM lq_kd_kdjlb kd
+                    INNER JOIN (
+                        SELECT DISTINCT glkdbh
+                        FROM lq_kd_pxmx
+                        WHERE F_IsEffective = 1
+                            AND NOT (px = '61' AND (COALESCE(F_ActualPrice, 0) = 0 AND COALESCE(F_TotalPrice, 0) = 0))
+                    ) valid_px ON valid_px.glkdbh = kd.F_Id
+                    WHERE kd.F_IsEffective = 1
+                        AND kd.kdhy IN ('{string.Join("','", memberIds)}')";
+                var billingMembers = await _db.Ado.SqlQueryAsync<dynamic>(sql);
+                if (billingMembers != null)
+                {
+                    var memberIdList = billingMembers.Select(x => x.MemberId?.ToString()).Where(x => !string.IsNullOrEmpty(x)).Cast<string>().ToList();
+                    hasBillingMemberIds = new HashSet<string>(memberIdList);
+                }
+            }
+
+            // 更新hasBilling字段
+            if (data.list != null)
+            {
+                foreach (var item in data.list)
+                {
+                    if (memberIdDict.TryGetValue(item.id, out var memberId) && !string.IsNullOrEmpty(memberId))
+                    {
+                        item.hasBilling = hasBillingMemberIds.Contains(memberId) ? "是" : "否";
+                    }
+                    else
+                    {
+                        item.hasBilling = "否";
+                    }
+                }
+            }
+
             return PageResult<LqTkjlbListOutput>.SqlSugarPageResult(data);
         }
         #endregion
@@ -2036,9 +2036,20 @@ namespace NCC.Extend.LqXhHyhk
                     .WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => pxmx.ItemCategory == input.ItemType);
                 // 2. 通过 EXISTS 子查询筛选关联字段（在分页前筛选，确保分页准确）
+                // 处理多门店筛选：优先使用StoreIds，如果没有则使用StoreId
+                var filterStoreIds = new List<string>();
+                if (input.StoreIds != null && input.StoreIds.Any())
+                {
+                    filterStoreIds = input.StoreIds.Where(x => !string.IsNullOrEmpty(x)).ToList();
+                }
+                else if (!string.IsNullOrEmpty(input.StoreId))
+                {
+                    filterStoreIds = new List<string> { input.StoreId };
+                }
+
                 baseQuery = baseQuery.WhereIF(!string.IsNullOrEmpty(input.MemberName), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Khmc != null && x.Khmc.Contains(input.MemberName)).Any())
                     .WhereIF(!string.IsNullOrEmpty(input.MemberPhone), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Sjh == input.MemberPhone).Any())
-                    .WhereIF(!string.IsNullOrEmpty(input.StoreId), pxmx => SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(x => x.Id == pxmx.ConsumeInfoId && x.Md == input.StoreId).Any());
+                    .WhereIF(filterStoreIds.Any(), pxmx => SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(x => x.Id == pxmx.ConsumeInfoId && filterStoreIds.Contains(x.Md)).Any());
                 // 3. 先分页查询主表数据（查询实体类，提高性能）
                 var pagedData = await baseQuery.OrderBy(sidx + " " + sort).ToPagedListAsync(input.currentPage, input.pageSize);