新增历史会员权益数据导入功能

- 在LqKdKdjlbService中实现ImportHistoryMemberRights方法，支持将历史会员权益数据导入到开单记录表和开单品项明细表 - 添加详细的导入规则和字段映射说明 - 优化LqEventService，新增eventCoordinatorName字段以显示活动负责人姓名 - 更新LqKhxx相关DTO，移除不必要的字段，简化数据结构

新增历史会员权益数据导入功能
- 在LqKdKdjlbService中实现ImportHistoryMemberRights方法，支持将历史会员权益数据导入到开单记录表和开单品项明细表 - 添加详细的导入规则和字段映射说明 - 优化LqEventService，新增eventCoordinatorName字段以显示活动负责人姓名 - 更新LqKhxx相关DTO，移除不必要的字段，简化数据结构
“wangming”
1 parent 150862dd
Showing 11 changed files with 164 additions and 217 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEvent/LqEventInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEvent/LqEventListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
netcore/src/Modularity/Extend/NCC.Extend/LqEventService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
@@ -34,6 +34,7 @@ namespace NCC.Extend.Entitys.Dto.LqEvent
         /// </summary>
         public string eventCoordinator { get; set; }
+
         /// <summary>
         /// 活动编号
         /// </summary>
@@ -32,6 +32,12 @@ namespace NCC.Extend.Entitys.Dto.LqEvent
         /// </summary>
         public string eventCoordinator { get; set; }
+
+        /// <summary>
+        /// 活动负责人姓名
+        /// </summary>
+        public string eventCoordinatorName { get; set; }
+
         /// <summary>
         /// 活动编号
         /// </summary>
@@ -32,28 +32,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 性别
         /// </summary>
         public string xb { get; set; }
-
-        /// <summary>
-        /// 公众号状态
-        /// </summary>
-        public string gzhzt { get; set; }
-
-        /// <summary>
-        /// 微信昵称
-        /// </summary>
-        public string wxnc { get; set; }
-
-        /// <summary>
-        /// 微信小程序状态
-        /// </summary>
-        public string wxxcxzt { get; set; }
-
-        /// <summary>
-        /// 最近登录时间
-        /// </summary>
-        public string zjdlsj { get; set; }
-
-
         /// <summary>
         /// 归属门店
         /// </summary>
@@ -90,16 +68,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string tjr { get; set; }
         /// <summary>
-        /// 负责顾问
-        /// </summary>
-        public string fzgw { get; set; }
-
-        /// <summary>
-        /// 美容师
-        /// </summary>
-        public string mrs { get; set; }
-
-        /// <summary>
         /// 进店渠道
         /// </summary>
         public string jdqd { get; set; }
@@ -124,10 +92,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// </summary>
         public DateTime? yinlsr { get; set; }
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string ml { get; set; }
         /// <summary>
         /// 拓客人员
@@ -33,26 +33,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// </summary>
         public string xb { get; set; }
-        /// <summary>
-        /// 公众号状态
-        /// </summary>
-        public string gzhzt { get; set; }
-
-        /// <summary>
-        /// 微信昵称
-        /// </summary>
-        public string wxnc { get; set; }
-
-        /// <summary>
-        /// 微信小程序状态
-        /// </summary>
-        public string wxxcxzt { get; set; }
-
-        /// <summary>
-        /// 最近登录时间
-        /// </summary>
-        public DateTime? zjdlsj { get; set; }
-
         /// <summary>
         /// 归属门店
@@ -90,14 +70,10 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string tjr { get; set; }
         /// <summary>
-        /// 负责顾问
+        /// 推荐人名称
         /// </summary>
-        public string fzgw { get; set; }
+        public string tjrName { get; set; }
-        /// <summary>
-        /// 美容师
-        /// </summary>
-        public string mrs { get; set; }
         /// <summary>
         /// 进店渠道
@@ -125,11 +101,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public DateTime? yinlsr { get; set; }
         /// <summary>
-        /// 年龄
-        /// </summary>
-        public string ml { get; set; }
-
-        /// <summary>
         /// 添加时间
         /// </summary>
         public string createTime { get; set; }
@@ -35,26 +35,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string xb { get; set; }
         /// <summary>
-        /// 公众号状态
-        /// </summary>
-        public string gzhzt { get; set; }
-
-        /// <summary>
-        /// 微信昵称
-        /// </summary>
-        public string wxnc { get; set; }
-
-        /// <summary>
-        /// 微信小程序状态
-        /// </summary>
-        public string wxxcxzt { get; set; }
-
-        /// <summary>
-        /// 最近登录时间
-        /// </summary>
-        public DateTime? zjdlsj { get; set; }
-
-        /// <summary>
         /// 归属门店
         /// </summary>
         public string gsmd { get; set; }
@@ -111,19 +91,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string tjr { get; set; }
         /// <summary>
-        /// 负责顾问
+        /// 推荐人名称
         /// </summary>
-        public string fzgw { get; set; }
+        public string tjrName { get; set; }
-        /// <summary>
-        /// 美容师
-        /// </summary>
-        public string mrs { get; set; }
-        /// <summary>
-        /// 美容师名称
-        /// </summary>
-        public string mrsName { get; set; }
         /// <summary>
         /// 进店渠道
@@ -48,20 +48,7 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// </summary>
         public string xb { get; set; }
-        /// <summary>
-        /// 公众号状态
-        /// </summary>
-        public string gzhzt { get; set; }
-
-        /// <summary>
-        /// 微信昵称
-        /// </summary>
-        public string wxnc { get; set; }
-        /// <summary>
-        /// 微信小程序状态
-        /// </summary>
-        public string wxxcxzt { get; set; }
         /// <summary>
         /// 归属门店
@@ -98,15 +85,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// </summary>
         public string tjr { get; set; }
-        /// <summary>
-        /// 负责顾问
-        /// </summary>
-        public string fzgw { get; set; }
-
-        /// <summary>
-        /// 美容师
-        /// </summary>
-        public string mrs { get; set; }
         /// <summary>
         /// 进店渠道
@@ -132,10 +110,5 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 阴历生日
         /// </summary>
         public string yinlsr { get; set; }
-
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string ml { get; set; }
     }
 }
@@ -42,30 +42,6 @@ namespace NCC.Extend.Entitys.lq_khxx
         public string Xb { get; set; }
         /// <summary>
-        /// 公众号状态
-        /// </summary>
-        [SugarColumn(ColumnName = "gzhzt")]
-        public string Gzhzt { get; set; }
-
-        /// <summary>
-        /// 微信昵称
-        /// </summary>
-        [SugarColumn(ColumnName = "wxnc")]
-        public string Wxnc { get; set; }
-
-        /// <summary>
-        /// 微信小程序状态
-        /// </summary>
-        [SugarColumn(ColumnName = "wxxcxzt")]
-        public string Wxxcxzt { get; set; }
-
-        /// <summary>
-        /// 最近登录时间
-        /// </summary>
-        [SugarColumn(ColumnName = "zjdlsj")]
-        public DateTime? Zjdlsj { get; set; }
-
-        /// <summary>
         /// 归属门店
         /// </summary>
         [SugarColumn(ColumnName = "gsmd")]
@@ -107,17 +83,6 @@ namespace NCC.Extend.Entitys.lq_khxx
         [SugarColumn(ColumnName = "tjr")]
         public string Tjr { get; set; }
-        /// <summary>
-        /// 负责顾问
-        /// </summary>
-        [SugarColumn(ColumnName = "fzgw")]
-        public string Fzgw { get; set; }
-
-        /// <summary>
-        /// 美容师
-        /// </summary>
-        [SugarColumn(ColumnName = "mrs")]
-        public string Mrs { get; set; }
         /// <summary>
         /// 进店渠道
@@ -150,12 +115,6 @@ namespace NCC.Extend.Entitys.lq_khxx
         public DateTime? Yinlsr { get; set; }
         /// <summary>
-        /// 年龄
-        /// </summary>
-        [SugarColumn(ColumnName = "ml")]
-        public string Ml { get; set; }
-
-        /// <summary>
         /// 添加时间
         /// </summary>
         [SugarColumn(ColumnName = "F_CreateTime")]
@@ -99,6 +99,7 @@ namespace NCC.Extend.LqEvent
                     eventNumber = e.EventNumber,
                     memberCount = SqlFunc.Subqueryable<LqEventUserEntity>().Where(u => u.EventId == e.Id).Count(),
                     eventType = e.EventType,
+                    eventCoordinatorName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == e.EventCoordinator).Select(u => u.RealName),
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + sord)
@@ -1077,6 +1077,152 @@ namespace NCC.Extend.LqKdKdjlb
         }
         #endregion
+        #region 历史会员权益数据导入
+        /// <summary>
+        /// 导入历史会员权益数据到开单记录表和开单品项明细表
+        /// </summary>
+        /// <remarks>
+        /// 将历史会员权益表的数据导入到开单记录表和开单品项明细表中
+        /// 
+        /// 导入规则：
+        /// 1. 逐条处理历史会员权益数据，每条记录生成一个开单记录和一个品项明细
+        /// 2. 开单时间和创建时间统一设置为 2025-06-01 00:00:00
+        /// 3. 使用YitIdHelper生成所有ID
+        /// 4. 直接使用F_StoreId作为门店ID
+        /// 
+        /// 字段映射：
+        /// - F_MemberId/会员编号 -> kdhy (开单会员，优先使用会员ID)
+        /// - 会员名称 -> kdhyc (开单会员名称)
+        /// - 会员电话 -> kdhysjh (开单会员手机号)
+        /// - F_StoreId -> djmd (单据门店ID)
+        /// - 整单业绩 -> zdyj (整单业绩)
+        /// - 实付业绩 -> sfyj (实付业绩)
+        /// - 欠款 -> qk (欠款)
+        /// - 来源 -> khly (客户来源)
+        /// - 品项名称 -> pxmc (品项名称)
+        /// - 品项价格 -> pxjg (品项价格)
+        /// - 品项次数 -> F_ProjectNumber (项目次数)
+        /// - F_MemberId/会员编号 -> F_MemberId (品项明细会员ID，优先使用会员ID)
+        /// </remarks>
+        /// <returns>导入结果统计</returns>
+        /// <response code="200">导入成功</response>
+        /// <response code="500">服务器内部错误</response>
+        [HttpPost("import-history-member-rights")]
+        public async Task<dynamic> ImportHistoryMemberRights()
+        {
+            try
+            {
+                _db.BeginTran();
+
+                // 设置固定的时间
+                var fixedDateTime = new DateTime(2025, 6, 1, 0, 0, 0);
+
+                // 1. 查询历史会员权益数据
+                var historyData = await _db.Ado.SqlQueryAsync<dynamic>(@"
+                    SELECT 
+                        会员编号,
+                        会员名称,
+                        会员电话,
+                        开单门店,
+                        开单时间,
+                        整单业绩,
+                        实付业绩,
+                        欠款,
+                        来源,
+                        品项名称,
+                        品项价格,
+                        品项次数,
+                        F_StoreId,
+                        F_ProjectId,
+                        F_MemberId
+                    FROM `历史会员权益`");
+
+                int successCount = 0;
+                int errorCount = 0;
+                var errorMessages = new List<string>();
+
+                // 2. 逐条处理历史会员权益数据
+                foreach (var item in historyData)
+                {
+                    try
+                    {
+                        // 3. 生成开单记录ID
+                        string kdjlbId = YitIdHelper.NextId().ToString();
+
+                        // 4. 创建开单记录
+                        var kdjlbEntity = new LqKdKdjlbEntity
+                        {
+                            Id = kdjlbId,
+                            Djmd = item.F_StoreId, // 直接使用F_StoreId
+                            Kdhy = item.F_MemberId,
+                            Kdhyc = item.会员名称,
+                            Jsj = "暂无",
+                            Kdhysjh = item.会员电话,
+                            Kdrq = fixedDateTime,
+                            Zdyj = Convert.ToDecimal(item.整单业绩 ?? 0),
+                            Sfyj = Convert.ToDecimal(item.实付业绩 ?? 0),
+                            Qk = Convert.ToDecimal(item.欠款 ?? 0),
+                            CreateTime = fixedDateTime,
+                            UpdateTime = fixedDateTime,
+                            Sfskdd = "否",
+                            IsEffective = 1,
+                            Bz = "导入历史会员权益数据"
+                        };
+
+                        await _db.Insertable(kdjlbEntity).ExecuteCommandAsync();
+
+                        // 5. 创建品项明细
+                        string pxmxId = YitIdHelper.NextId().ToString();
+
+                        var pxmxEntity = new LqKdPxmxEntity
+                        {
+                            Id = pxmxId,
+                            Glkdbh = kdjlbId,
+                            Px = item.F_ProjectId,
+                            Pxmc = item.品项名称,
+                            Pxjg = Convert.ToDecimal(item.品项价格 ?? 0),
+                            ProjectNumber = Convert.ToDecimal(item.品项次数 ?? 0),
+                            SourceType = item.来源,
+                            MemberId = item.F_MemberId,
+                            Yjsj = fixedDateTime,
+                            CreateTIme = fixedDateTime,
+                            IsEffective = 1,
+                            IsEnabled = 0,
+                            TotalPrice = Convert.ToDecimal(item.品项价格 ?? 0) * Convert.ToDecimal(item.品项次数 ?? 0),
+                            ActualPrice = Convert.ToDecimal(item.品项价格 ?? 0) * Convert.ToDecimal(item.品项次数 ?? 0)
+                        };
+
+                        await _db.Insertable(pxmxEntity).ExecuteCommandAsync();
+
+                        successCount++;
+                    }
+                    catch (Exception ex)
+                    {
+                        errorCount++;
+                        errorMessages.Add($"处理记录 {item.会员编号}-{item.品项名称} 时出错: {ex.Message}");
+                    }
+                }
+
+                _db.CommitTran();
+
+                return new
+                {
+                    success = true,
+                    message = "历史会员权益数据导入完成",
+                    totalRecords = historyData.Count,
+                    successCount = successCount,
+                    errorCount = errorCount,
+                    errorMessages = errorMessages.Take(10).ToList(), // 只返回前10个错误信息
+                    importTime = DateTime.Now
+                };
+            }
+            catch (Exception ex) when (!(ex is NCCException))
+            {
+                _db.RollbackTran();
+                throw NCCException.Oh($"导入历史会员权益数据失败: {ex.Message}");
+            }
+        }
+        #endregion
     }
 }
@@ -71,36 +71,27 @@ namespace NCC.Extend.LqKhxx
         {
             var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
             var output = entity.Adapt<LqKhxxInfoOutput>();
-
-            // 安全查询用户姓名，处理空值情况
             if (!string.IsNullOrEmpty(entity.ExpandUser))
             {
                 var expandUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.ExpandUser).FirstAsync();
                 output.expandUserName = expandUser?.RealName ?? "";
             }
-            else
-            {
-                output.expandUserName = "";
-            }
             if (!string.IsNullOrEmpty(entity.MainHealthUser))
             {
                 var mainHealthUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.MainHealthUser).FirstAsync();
                 output.mainHealthUserName = mainHealthUser?.RealName ?? "";
             }
-            else
-            {
-                output.mainHealthUserName = "";
-            }
             if (!string.IsNullOrEmpty(entity.SubHealthUser))
             {
                 var subHealthUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.SubHealthUser).FirstAsync();
                 output.subHealthUserName = subHealthUser?.RealName ?? "";
             }
-            else
+            if (!string.IsNullOrEmpty(entity.Tjr))
             {
-                output.subHealthUserName = "";
+                var tjr = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.Tjr).FirstAsync();
+                output.tjrName = tjr?.RealName ?? "";
             }
             return output;
         }
@@ -123,21 +114,15 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
                 .WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
                 .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
-                .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
-                .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
-                .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
                 .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
                 .WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
                 .WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
                 .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
                 .WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
                 .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
-                .WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
-                .WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
                 .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                 .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
-                .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -145,9 +130,6 @@ namespace NCC.Extend.LqKhxx
                     sjh = it.Sjh,
                     dah = it.Dah,
                     xb = it.Xb,
-                    gzhzt = it.Gzhzt,
-                    wxnc = it.Wxnc,
-                    wxxcxzt = it.Wxxcxzt,
                     gsmd = it.Gsmd,
                     gsmdName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == it.Gsmd).Select(u => u.Dm),
                     zcsj = it.Zcsj,
@@ -156,15 +138,11 @@ namespace NCC.Extend.LqKhxx
                     khxf = it.Khxf,
                     xfpc = it.Xfpc,
                     tjr = it.Tjr,
-                    fzgw = it.Fzgw,
-                    mrs = it.Mrs,
-                    mrsName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Mrs).Select(u => u.RealName),
                     jdqd = it.Jdqd,
                     lxdz = it.Lxdz,
                     bz = it.Bz,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
-                    ml = it.Ml,
                     createTime = it.CreateTime,
                     expandUser = it.ExpandUser,
                     mainHealthUser = it.MainHealthUser,
@@ -172,6 +150,7 @@ namespace NCC.Extend.LqKhxx
                     expandUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.ExpandUser).Select(u => u.RealName),
                     mainHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.MainHealthUser).Select(u => u.RealName),
                     subHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.SubHealthUser).Select(u => u.RealName),
+                    tjrName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(u => u.Id == it.Tjr).Select(u => u.Khmc),
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
@@ -235,9 +214,6 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
                 .WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
                 .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
-                .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
-                .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
-                .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
                 .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
                 .WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
@@ -246,8 +222,6 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Equals(input.khxf))
                 .WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
                 .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
-                .WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
-                .WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
                 .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                 .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
@@ -255,7 +229,6 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -263,10 +236,6 @@ namespace NCC.Extend.LqKhxx
                     sjh = it.Sjh,
                     dah = it.Dah,
                     xb = it.Xb,
-                    gzhzt = it.Gzhzt,
-                    wxnc = it.Wxnc,
-                    wxxcxzt = it.Wxxcxzt,
-                    zjdlsj = it.Zjdlsj,
                     gsmd = it.Gsmd,
                     zcsj = it.Zcsj,
                     khlx = it.Khlx,
@@ -274,14 +243,11 @@ namespace NCC.Extend.LqKhxx
                     khxf = it.Khxf,
                     xfpc = it.Xfpc,
                     tjr = it.Tjr,
-                    fzgw = it.Fzgw,
-                    mrs = it.Mrs,
                     jdqd = it.Jdqd,
                     lxdz = it.Lxdz,
                     bz = it.Bz,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
-                    ml = it.Ml,
                     createTime = it.CreateTime,
                 })
                 .MergeTable()
@@ -318,9 +284,6 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
                 .WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
                 .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
-                .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
-                .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
-                .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
                 .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
                 .WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
@@ -329,8 +292,6 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
                 .WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
                 .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
-                .WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
-                .WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
                 .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                 .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
@@ -338,7 +299,6 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -346,10 +306,6 @@ namespace NCC.Extend.LqKhxx
                     sjh = it.Sjh,
                     dah = it.Dah,
                     xb = it.Xb,
-                    gzhzt = it.Gzhzt,
-                    wxnc = it.Wxnc,
-                    wxxcxzt = it.Wxxcxzt,
-                    zjdlsj = it.Zjdlsj,
                     gsmd = it.Gsmd,
                     zcsj = it.Zcsj,
                     khlx = it.Khlx,
@@ -357,14 +313,11 @@ namespace NCC.Extend.LqKhxx
                     khxf = it.Khxf,
                     xfpc = it.Xfpc,
                     tjr = it.Tjr,
-                    fzgw = it.Fzgw,
-                    mrs = it.Mrs,
                     jdqd = it.Jdqd,
                     lxdz = it.Lxdz,
                     bz = it.Bz,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
-                    ml = it.Ml,
                     createTime = it.CreateTime,
                     expandUser = it.ExpandUser,
                     mainHealthUser = it.MainHealthUser,
@@ -121,7 +121,7 @@ namespace NCC.Extend.LqTkjlb
                     id = it.Id,
                     expansionTime = it.ExpansionTime,
                     expansionUserId = it.ExpansionUserId,
-                    expansionUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.MobilePhone == it.ExpansionUserId).Select(u => u.RealName),
+                    expansionUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.ExpansionUserId).Select(u => u.RealName),
                     customerName = it.CustomerName,
                     customerPhone = it.CustomerPhone,
                     buyNumber = it.BuyNumber,
@@ -186,6 +186,7 @@ namespace NCC.Extend.LqTkjlb
                 MemberInfo.Sjh = input.customerPhone; // 设置手机号
                 MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString();
                 MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmss");
+                MemberInfo.Jdqd = "19.9卡";
                 //找到input.expansionUserId的用户信息
                 var userInfo = await _db.Queryable<UserEntity>().Where(u => u.Id == input.expansionUserId).FirstAsync();
                 //判断 岗位是否为健康师，如果是健康师，则设置拓客人员是健康师