Blame view

netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs 146 KB
257347ad   “wangming”   feat: enhance fil...
1
  using System;
d98270e2   “wangming”   Enhance LqEventSe...
2
  using System.Collections.Generic;
fd65ae16   “wangming”   feat: inventory a...
3
  using System.IO;
d98270e2   “wangming”   Enhance LqEventSe...
4
5
6
7
8
9
10
11
  using System.Linq;
  using System.Threading.Tasks;
  using Mapster;
  using Microsoft.AspNetCore.Mvc;
  using Microsoft.Extensions.Logging;
  using NCC.ClayObject;
  using NCC.Common.Configuration;
  using NCC.Common.Core.Manager;
96009bc9   hexiaodong   hxd
12
13
14
  using NCC.Common.Enum;
  using NCC.Common.Extension;
  using NCC.Common.Filter;
d98270e2   “wangming”   Enhance LqEventSe...
15
16
17
  using NCC.Common.Helper;
  using NCC.Common.Model.NPOI;
  using NCC.DataEncryption;
96009bc9   hexiaodong   hxd
18
19
  using NCC.Dependency;
  using NCC.DynamicApiController;
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
20
  using NCC.Extend.Entitys.Dto.LqPersonTimesRecord;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
21
  using NCC.Extend.Entitys.Dto.LqXhHyhk;
d98270e2   “wangming”   Enhance LqEventSe...
22
23
24
  using NCC.Extend.Entitys.Dto.LqXhJksyj;
  using NCC.Extend.Entitys.Dto.LqXhKjbsyj;
  using NCC.Extend.Entitys.Dto.LqXhPxmx;
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
25
  using NCC.Extend.Entitys.Dto.LqYyjl;
2164125c   “wangming”   feat: 删除LqXhmxb相关...
26
  using NCC.Extend.Entitys.Enum;
b5df6609   “wangming”   ```
27
28
  using NCC.Extend.Entitys.lq_yyjl;
  using NCC.Extend.Helpers;
d98270e2   “wangming”   Enhance LqEventSe...
29
30
31
  using NCC.Extend.Entitys.lq_kd_kdjlb;
  using NCC.Extend.Entitys.lq_kd_pxmx;
  using NCC.Extend.Entitys.lq_khxx;
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
32
  using NCC.Extend.Entitys.lq_person_times_record;
685a8b32   “wangming”   feat: enhance cus...
33
  using NCC.Extend.Entitys.lq_xh_feedback;
efde7d04   “wangming”   更新多个文件,删除不再使用的CSS...
34
35
36
37
  using NCC.Extend.Entitys.lq_xh_hyhk;
  using NCC.Extend.Entitys.lq_xh_jksyj;
  using NCC.Extend.Entitys.lq_xh_kjbsyj;
  using NCC.Extend.Entitys.lq_xh_pxmx;
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
38
  using NCC.Extend.Entitys.lq_xmzl;
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
39
  using NCC.Extend.Entitys.lq_mdxx;
d98270e2   “wangming”   Enhance LqEventSe...
40
41
  using NCC.Extend.Interfaces.LqXhHyhk;
  using NCC.FriendlyException;
96009bc9   hexiaodong   hxd
42
  using NCC.JsonSerialization;
d98270e2   “wangming”   Enhance LqEventSe...
43
44
  using SqlSugar;
  using Yitter.IdGenerator;
96009bc9   hexiaodong   hxd
45
46
47
48
  
  namespace NCC.Extend.LqXhHyhk
  {
      /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
49
      /// 耗卡记录表服务
96009bc9   hexiaodong   hxd
50
      /// </summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
51
      [ApiDescriptionSettings(Tag = "绿纤耗卡记录表服务", Name = "LqXhHyhk", Order = 200, Groups = new[] { "Default" })]
96009bc9   hexiaodong   hxd
52
      [Route("api/Extend/[controller]")]
b5df6609   “wangming”   ```
53
      public partial class LqXhHyhkService : ILqXhHyhkService, IDynamicApiController, ITransient
96009bc9   hexiaodong   hxd
54
55
56
57
58
59
60
      {
          private readonly ISqlSugarRepository<LqXhHyhkEntity> _lqXhHyhkRepository;
          private readonly ISqlSugarRepository<LqXhJksyjEntity> _lqXhJksyjRepository;
          private readonly ISqlSugarRepository<LqXhKjbsyjEntity> _lqXhKjbsyjRepository;
          private readonly ISqlSugarRepository<LqXhPxmxEntity> _lqXhPxmxRepository;
          private readonly SqlSugarScope _db;
          private readonly IUserManager _userManager;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
61
          private readonly ILogger<LqXhHyhkService> _logger;
96009bc9   hexiaodong   hxd
62
63
64
65
66
67
68
69
70
  
          /// <summary>
          /// 初始化一个<see cref="LqXhHyhkService"/>类型的新实例
          /// </summary>
          public LqXhHyhkService(
              ISqlSugarRepository<LqXhHyhkEntity> lqXhHyhkRepository,
              ISqlSugarRepository<LqXhJksyjEntity> lqXhJksyjRepository,
              ISqlSugarRepository<LqXhKjbsyjEntity> lqXhKjbsyjRepository,
              ISqlSugarRepository<LqXhPxmxEntity> lqXhPxmxRepository,
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
71
              IUserManager userManager,
d98270e2   “wangming”   Enhance LqEventSe...
72
73
              ILogger<LqXhHyhkService> logger
          )
96009bc9   hexiaodong   hxd
74
          {
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
75
              _lqXhHyhkRepository = lqXhHyhkRepository;
96009bc9   hexiaodong   hxd
76
77
78
79
80
              _db = _lqXhHyhkRepository.Context;
              _lqXhJksyjRepository = lqXhJksyjRepository;
              _lqXhKjbsyjRepository = lqXhKjbsyjRepository;
              _lqXhPxmxRepository = lqXhPxmxRepository;
              _userManager = userManager;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
81
              _logger = logger;
96009bc9   hexiaodong   hxd
82
83
          }
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
84
          #region 获取会员耗卡
96009bc9   hexiaodong   hxd
85
86
87
          /// <summary>
          /// 获取会员耗卡
          /// </summary>
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
88
89
90
          /// <remarks>
          /// 获取耗卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
          /// 按照耗卡的完整格式返回数据,不包含汇总信息
d98270e2   “wangming”   Enhance LqEventSe...
91
          ///
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
92
93
94
95
96
97
98
99
100
101
102
          /// 返回数据结构:
          /// - 主表信息:耗卡基础信息、门店信息、会员信息等
          /// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
          /// - 健康师业绩列表:按品项关联的健康师业绩信息
          /// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
          /// </remarks>
          /// <param name="id">耗卡记录主键ID</param>
          /// <returns>耗卡记录完整信息</returns>
          /// <response code="200">查询成功</response>
          /// <response code="404">耗卡记录不存在</response>
          /// <response code="500">服务器内部错误</response>
96009bc9   hexiaodong   hxd
103
104
105
          [HttpGet("{id}")]
          public async Task<dynamic> GetInfo(string id)
          {
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
106
107
              try
              {
9c60e8ba   “wangming”   ```
108
109
                  // 1. 查询主表信息(Where().FirstAsync 无记录时返回 null;表达式重载会抛异常)
                  var entity = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id).FirstAsync();
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
110
                  if (entity == null)
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
111
                      throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在");
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
112
113
  
                  var output = entity.Adapt<LqXhHyhkInfoOutput>();
9c60e8ba   “wangming”   ```
114
115
116
117
                  // 获取会员信息(优先会员档案,回退耗卡主档冗余字段)
                  var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(p => p.Id == entity.Hy).FirstAsync();
                  output.hymc = memberInfo?.Khmc ?? entity.Hymc;
                  output.memberPhone = memberInfo?.Sjh ?? entity.MemberPhone;
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
118
119
  
                  // 2. 查询品项明细列表
b45d55f7   “wangming”   Refactor LqEventS...
120
                  var lqXhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(w => w.ConsumeInfoId == entity.Id).ToListAsync();
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
121
                  // 3. 查询健康师业绩列表
d98270e2   “wangming”   Enhance LqEventSe...
122
                  var lqXhJksyjList = await _db.Queryable<LqXhJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
123
                  // 4. 查询科技部老师业绩列表
d98270e2   “wangming”   Enhance LqEventSe...
124
                  var lqXhKjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
125
126
                  // 获取人次记录列表
                  var personTimesRecordList = await _db.Queryable<LqPersonTimesRecordEntity>().Where(x => x.BusinessId == entity.Id && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
127
128
129
130
131
132
133
                  // 5. 构建品项明细输出,每个品项关联对应的业绩信息
                  var pxmxOutputList = new List<LqXhPxmxInfoOutput>();
                  foreach (var pxmx in lqXhPxmxList)
                  {
                      var pxmxOutput = new LqXhPxmxInfoOutput
                      {
                          id = pxmx.Id,
b45d55f7   “wangming”   Refactor LqEventS...
134
135
                          consumeInfoId = pxmx.ConsumeInfoId,
                          billingItemId = pxmx.BillingItemId,
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
136
137
138
                          px = pxmx.Px,
                          pxmc = pxmx.Pxmc,
                          pxjg = pxmx.Pxjg,
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
139
140
141
                          memberId = pxmx.MemberId,
                          createTime = pxmx.CreateTIme,
                          projectNumber = pxmx.ProjectNumber,
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
142
                          sourceType = pxmx.SourceType,
d98270e2   “wangming”   Enhance LqEventSe...
143
                          totalPrice = pxmx.TotalPrice,
d7925aaa   “wangming”   星期五了,下班咯
144
                          isEffective = pxmx.IsEffective,
e09804e2   “wangming”   fix: 更新消耗服务相关代码
145
146
                          originalProjectNumber = pxmx.OriginalProjectNumber,
                          overtimeProjectNumber = pxmx.OvertimeProjectNumber
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
147
148
149
150
151
152
153
154
155
156
157
158
                      };
  
                      // 关联该品项的健康师业绩
                      var jksyjForPx = lqXhJksyjList.Where(j => j.Kdpxid == pxmx.Id).ToList();
                      pxmxOutput.lqXhJksyjList = jksyjForPx.Adapt<List<LqXhJksyjInfoOutput>>();
  
                      // 关联该品项的科技部老师业绩
                      var kjbsyjForPx = lqXhKjbsyjList.Where(k => k.Hkpxid == pxmx.Id).ToList();
                      pxmxOutput.lqXhKjbsyjList = kjbsyjForPx.Adapt<List<LqXhKjbsyjInfoOutput>>();
  
                      pxmxOutputList.Add(pxmxOutput);
                  }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
159
  
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
160
161
                  // 6. 设置输出结果
                  output.lqXhPxmxList = pxmxOutputList;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
162
  
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
163
164
165
                  // 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
                  output.lqXhJksyjList = lqXhJksyjList.Adapt<List<LqXhJksyjInfoOutput>>();
                  output.lqXhKjbsyjList = lqXhKjbsyjList.Adapt<List<LqXhKjbsyjInfoOutput>>();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
166
  
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
167
168
                  return output;
              }
9c60e8ba   “wangming”   ```
169
170
171
172
              catch (AppFriendlyException)
              {
                  throw;
              }
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
173
174
175
176
177
              catch (Exception ex)
              {
                  _logger.LogError(ex, "获取耗卡记录失败,ID:{Id}", id);
                  throw NCCException.Oh(ErrorCode.COM1000, "获取耗卡记录失败");
              }
96009bc9   hexiaodong   hxd
178
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
179
          #endregion
96009bc9   hexiaodong   hxd
180
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
181
          #region 获取会员耗卡列表
96009bc9   hexiaodong   hxd
182
          /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
183
184
          /// 获取会员耗卡列表
          /// </summary>
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
          /// <remarks>
          /// 根据多种条件查询会员耗卡记录列表,支持分页、排序、筛选等功能
          /// 
          /// 示例请求:
          /// GET /api/Extend/LqXhHyhk/GetList?currentPage=1&amp;pageSize=10&amp;jksId=健康师ID&amp;startTime=2025-01-01&amp;endTime=2025-01-31
          /// 
          /// 传入参数说明:
          /// - currentPage: 当前页码(必填,默认1
          /// - pageSize: 每页数量(必填,默认10
          /// - sidx: 排序字段(可选,默认"id"
          /// - sort: 排序方式(可选,ASC/DESC,默认DESC
          /// - keyword: 关键字搜索(可选,搜索会员名称、账号、手机号)
          /// - id: 耗卡编号(可选,模糊匹配)
          /// - md: 门店ID(可选,精确匹配)
          /// - mdbh: 门店编号(可选,模糊匹配)
          /// - mdmc: 门店名称(可选,模糊匹配)
          /// - hy: 会员ID(可选,精确匹配)
          /// - hyzh: 会员账号(可选,模糊匹配)
          /// - hymc: 会员名称(可选,模糊匹配)
          /// - gklx: 顾客类型(可选,精确匹配)
          /// - sfykjb: 是否有科技部(可选,精确匹配)
          /// - hksj: 耗卡时间(可选,格式:开始时间,结束时间,如:2025-01-01,2025-01-31
          /// - czry: 操作人员ID(可选,精确匹配)
          /// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认0
          /// - jksId: 健康师ID(可选,传入后只返回该健康师参与的耗卡记录)
          /// - kjblsId: 科技部老师ID(可选,传入后只返回该老师参与的耗卡记录)
          /// 
          /// 返回结果说明:
          /// - code: 响应状态码(200=成功)
          /// - msg: 响应消息
          /// - data: 分页数据对象
          ///   - list: 耗卡记录列表,每个记录包含:
          ///     - id: 耗卡编号
          ///     - md: 门店ID
          ///     - mdbh: 门店编号
          ///     - mdmc: 门店名称
          ///     - hy: 会员ID
          ///     - hyzh: 会员账号
          ///     - hymc: 会员名称
          ///     - memberPhone: 会员手机号
          ///     - gklx: 顾客类型
          ///     - xfje: 消费金额
          ///     - sgfy: 手工费用
          ///     - sfykjb: 是否有科技部
          ///     - hksj: 耗卡时间
          ///     - czry: 操作人员ID
          ///     - isEffective: 是否有效
          ///     - signatureFile: 签名文件
          ///     - overtimeCoefficient: 加班系数(NULL0表示非加班单,大于0表示加班单)
          ///     - originalSgfy: 原始手工费(用户输入的原始值)
          ///     - overtimeSgfy: 加班手工费(加班计算后的增量值)
          ///     - ConsumeDetails: 耗卡明细列表(品项明细),每个明细包含:
          ///       - id: 明细编号
          ///       - consumeInfoId: 耗卡记录ID
          ///       - billingItemId: 开单品项明细表ID
          ///       - px: 品项编号
          ///       - pxmc: 品项名称
          ///       - pxjg: 品项价格
          ///       - memberId: 会员ID
          ///       - createTime: 创建时间
          ///       - projectNumber: 项目次数
          ///       - originalProjectNumber: 原始项目次数
          ///       - overtimeProjectNumber: 加班项目次数
          ///       - sourceType: 来源类型(开卡/赠送/其他)
          ///       - totalPrice: 合计金额(品项价格 × 项目次数)
          ///       - isEffective: 是否有效
          ///     - lqXhJksyjList: 健康师业绩列表,每个业绩包含:
          ///       - id: 业绩编号
          ///       - glkdbh: 关联耗卡编号
          ///       - jks: 健康师ID
          ///       - jksxm: 健康师姓名
          ///       - jkszh: 健康师账号
          ///       - jksyj: 健康师业绩
          ///       - yjsj: 业绩时间
          ///       - jsjId: 金三角ID
          ///       - kdpxid: 耗卡品项ID
          ///       - laborCost: 手工费
          ///       - kdpxNumber: 耗卡品项次数
          ///       - originalKdpxNumber: 原始耗卡品项次数
          ///       - overtimeKdpxNumber: 加班耗卡品项次数
          ///       - originalLaborCost: 原始手工费
          ///       - overtimeLaborCost: 加班手工费
          ///       - isAccompanied: 是否陪同(0=否,1=是)
          ///       - accompaniedProjectNumber: 陪同项目数
          ///       - memberId: 会员ID
          ///       - memberName: 会员名称
          ///     - lqXhKjbsyjList: 科技部老师业绩列表,每个业绩包含:
          ///       - id: 业绩编号
          ///       - glkdbh: 关联耗卡编号
          ///       - kjbls: 科技部老师ID
          ///       - kjblsxm: 科技部老师姓名
          ///       - kjblszh: 科技部老师账号
          ///       - kjblsyj: 科技部老师业绩
          ///       - yjsj: 业绩时间
          ///       - hkpxid: 耗卡品项ID
          ///       - laborCost: 手工费
          ///       - hdpxNumber: 耗卡品项次数
          ///       - originalHdpxNumber: 原始耗卡品项次数
          ///       - overtimeHdpxNumber: 加班耗卡品项次数
          ///       - originalLaborCost: 原始手工费
          ///       - overtimeLaborCost: 加班手工费
          ///   - pagination: 分页信息
          ///     - total: 总记录数
          ///     - pageSize: 每页数量
          ///     - currentPage: 当前页码
          ///     - totalPages: 总页数
          /// </remarks>
          /// <param name="input">查询参数</param>
          /// <returns>分页的耗卡记录列表,包含耗卡基本信息、耗卡明细、健康师业绩、科技部老师业绩</returns>
          /// <response code="200">成功返回耗卡列表</response>
          /// <response code="400">参数错误</response>
          /// <response code="500">服务器内部错误</response>
96009bc9   hexiaodong   hxd
297
298
299
          [HttpGet("")]
          public async Task<dynamic> GetList([FromQuery] LqXhHyhkListQueryInput input)
          {
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
300
              var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
9c60e8ba   “wangming”   ```
301
              var orderBy = ResolveHyhkListOrderBy(input.sidx, sort);
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
302
303
304
305
306
307
308
309
310
311
              List<string> queryHksj = input.hksj != null ? input.hksj.Split(',').ToObeject<List<string>>() : null;
              DateTime? startHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.First()) : null;
              DateTime? endHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.Last()) : null;
  
              // 根据是否传入健康师ID或科技部老师ID来决定查询方式
              ISugarQueryable<LqXhHyhkEntity> query = null;
  
              // 如果两个都传入了,需要同时JOIN两个表
              if (!string.IsNullOrEmpty(input.jksId) && !string.IsNullOrEmpty(input.kjblsId))
              {
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
312
                  query = _db.Queryable<LqXhJksyjEntity, LqXhKjbsyjEntity, LqXhHyhkEntity>((jksyj, kjbsyj, hyhk) => jksyj.Glkdbh == hyhk.Id && kjbsyj.Glkdbh == hyhk.Id)
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
                      .Where((jksyj, kjbsyj, hyhk) => jksyj.Jkszh == input.jksId && jksyj.IsEffective == StatusEnum.有效.GetHashCode())
                      .Where((jksyj, kjbsyj, hyhk) => kjbsyj.Kjblszh == input.kjblsId && kjbsyj.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select((jksyj, kjbsyj, hyhk) => hyhk)
                      .Distinct()
                      .MergeTable(); // 将多表结果集变成单表,后续可以使用it别名
              }
              // 如果只传入了健康师ID,需要通过JOIN健康师业绩表来过滤
              else if (!string.IsNullOrEmpty(input.jksId))
              {
                  query = _db.Queryable<LqXhJksyjEntity, LqXhHyhkEntity>(
                          (jksyj, hyhk) => jksyj.Glkdbh == hyhk.Id)
                      .Where((jksyj, hyhk) => jksyj.Jkszh == input.jksId && jksyj.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select((jksyj, hyhk) => hyhk)
                      .Distinct()
                      .MergeTable(); // 将多表结果集变成单表,后续可以使用it别名
              }
              // 如果只传入了科技部老师ID,需要通过JOIN科技部老师业绩表来过滤
              else if (!string.IsNullOrEmpty(input.kjblsId))
              {
                  query = _db.Queryable<LqXhKjbsyjEntity, LqXhHyhkEntity>(
                          (kjbsyj, hyhk) => kjbsyj.Glkdbh == hyhk.Id)
                      .Where((kjbsyj, hyhk) => kjbsyj.Kjblszh == input.kjblsId && kjbsyj.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select((kjbsyj, hyhk) => hyhk)
                      .Distinct()
                      .MergeTable(); // 将多表结果集变成单表,后续可以使用it别名
              }
              // 如果都没有传入,直接查询耗卡表
              else
              {
                  query = _db.Queryable<LqXhHyhkEntity>();
              }
  
9c60e8ba   “wangming”   ```
345
              var entityPage = await query
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
346
347
348
349
350
351
352
353
354
355
356
357
358
359
                  .WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Hymc.Contains(input.keyword) || p.Hyzh.Contains(input.keyword) || p.MemberPhone.Contains(input.keyword))
                  .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                  .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
                  .WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
                  .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
                  .WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
                  .WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
                  .WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
                  .WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
                  .WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
                  .WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
                  .WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
                  .WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
9c60e8ba   “wangming”   ```
360
                  .OrderBy(orderBy)
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
361
362
                  .ToPagedListAsync(input.currentPage, input.pageSize);
  
9c60e8ba   “wangming”   ```
363
364
365
              var entityList = entityPage.list?.ToList() ?? new List<LqXhHyhkEntity>();
              var outputList = entityList.Select(MapHyhkEntityToListOutput).ToList();
              await FillListMemberJdqdAsync(outputList);
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
366
  
9c60e8ba   “wangming”   ```
367
368
369
              if (input.includeConsumeDetails == 1)
                  await AttachConsumeDetailsToListAsync(outputList);
              else
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
370
              {
9c60e8ba   “wangming”   ```
371
372
                  foreach (var item in outputList)
                      item.ConsumeDetails = new List<LqXhPxmxInfoOutput>();
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
373
374
              }
  
9c60e8ba   “wangming”   ```
375
376
377
              return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(
                  BuildHyhkListPageResult(entityPage, outputList));
          }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
378
  
9c60e8ba   “wangming”   ```
379
380
381
382
383
384
385
386
          /// <summary>
          /// 获取单条耗卡的品项明细(列表展开行懒加载)
          /// </summary>
          [HttpGet("Actions/GetConsumeDetails")]
          public async Task<dynamic> GetConsumeDetails([FromQuery] string consumeId)
          {
              if (string.IsNullOrWhiteSpace(consumeId))
                  throw NCCException.Oh("耗卡ID不能为空");
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
387
  
9c60e8ba   “wangming”   ```
388
389
390
              var exists = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == consumeId).AnyAsync();
              if (!exists)
                  throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在");
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
391
  
9c60e8ba   “wangming”   ```
392
393
              var details = await QueryConsumeDetailOutputsAsync(new List<string> { consumeId });
              return new { list = details };
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
394
          }
685a8b32   “wangming”   feat: enhance cus...
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
  
          /// <summary>
          /// 获取无耗卡日志的耗卡记录列表
          /// </summary>
          /// <remarks>
          /// 查询已发生耗卡但尚未填写耗卡日志(服务日志)的记录,支持按耗卡日期、会员姓名、电话等条件筛选
          ///
          /// 示例请求:
          /// GET /api/Extend/LqXhHyhk/Actions/GetNoFeedbackList?currentPage=1&amp;pageSize=10&amp;hksj=2025-01-01,2025-01-31&amp;hymc=张三&amp;memberPhone=138
          ///
          /// 参数说明:
          /// - hksj: 耗卡日期范围(格式:开始时间,结束时间,如:2025-01-01,2025-01-31
          /// - hymc: 会员姓名(模糊匹配)
          /// - memberPhone: 会员电话(模糊匹配)
          /// - keyword: 关键字(可选,搜索会员名称、账号、手机号)
          /// - md: 门店ID(可选)
          /// - currentPage: 当前页码
          /// - pageSize: 每页数量
          /// - sidx: 排序字段(默认hksj
          /// - sort: 排序方式(asc/desc,默认desc
          ///
          /// 返回说明:
          /// - 返回格式与GetList接口相同,包含耗卡基本信息、耗卡明细、健康师业绩、科技部老师业绩
          /// </remarks>
          /// <param name="input">查询参数</param>
          /// <returns>无耗卡日志的耗卡记录列表(分页)</returns>
          /// <response code="200">查询成功</response>
          /// <response code="400">参数错误</response>
          /// <response code="500">服务器内部错误</response>
          [HttpGet("Actions/GetNoFeedbackList")]
          public async Task<dynamic> GetNoFeedbackList([FromQuery] LqXhHyhkNoFeedbackListQueryInput input)
          {
              var sidx = input.sidx == null ? "hksj" : input.sidx;
              var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
              DateTime? startHksj = null;
              DateTime? endHksj = null;
              if (!string.IsNullOrEmpty(input.hksj))
              {
                  var parts = input.hksj.Split(',');
                  if (parts.Length >= 1 && DateTime.TryParse(parts[0].Trim(), out var start))
                      startHksj = start;
                  if (parts.Length >= 2 && DateTime.TryParse(parts[1].Trim(), out var end))
                      endHksj = end;
              }
              var queryHksj = startHksj != null || endHksj != null;
  
              // 耗卡表 LEFT JOIN 耗卡反馈表,筛选 feedback.Id  NULL 的记录(即无耗卡日志)
              var query = _db.Queryable<LqXhHyhkEntity, LqXhFeedbackEntity>((hyhk, feedback) => new JoinQueryInfos(
                      JoinType.Left, hyhk.Id == feedback.ConsumeId))
                  .Where((hyhk, feedback) => feedback.Id == null)
                  .Where((hyhk, feedback) => hyhk.IsEffective == StatusEnum.有效.GetHashCode())
                  .WhereIF(!string.IsNullOrEmpty(input.keyword), (hyhk, feedback) => hyhk.Hymc.Contains(input.keyword) || hyhk.Hyzh.Contains(input.keyword) || hyhk.MemberPhone.Contains(input.keyword))
                  .WhereIF(!string.IsNullOrEmpty(input.md), (hyhk, feedback) => hyhk.Md == input.md)
                  .WhereIF(!string.IsNullOrEmpty(input.hymc), (hyhk, feedback) => hyhk.Hymc.Contains(input.hymc))
                  .WhereIF(!string.IsNullOrEmpty(input.memberPhone), (hyhk, feedback) => hyhk.MemberPhone.Contains(input.memberPhone))
                  .WhereIF(queryHksj && startHksj.HasValue, (hyhk, feedback) => hyhk.Hksj >= new DateTime(startHksj.Value.Year, startHksj.Value.Month, startHksj.Value.Day, 0, 0, 0))
                  .WhereIF(queryHksj && endHksj.HasValue, (hyhk, feedback) => hyhk.Hksj <= new DateTime(endHksj.Value.Year, endHksj.Value.Month, endHksj.Value.Day, 23, 59, 59))
                  .Select((hyhk, feedback) => new LqXhHyhkListOutput
                  {
                      id = hyhk.Id,
                      md = hyhk.Md,
                      mdbh = hyhk.Mdbh,
                      mdmc = hyhk.Mdmc,
                      hy = hyhk.Hy,
                      hyzh = hyhk.Hyzh,
                      hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Khmc),
                      gklx = hyhk.Gklx,
9c60e8ba   “wangming”   ```
462
                      jdqd = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Jdqd),
685a8b32   “wangming”   feat: enhance cus...
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
                      xfje = SqlFunc.ToString(hyhk.Xfje),
                      sgfy = SqlFunc.ToString(hyhk.Sgfy),
                      sfykjb = hyhk.Sfykjb,
                      hksj = hyhk.Hksj,
                      czry = hyhk.Czry,
                      memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Sjh),
                      isEffective = hyhk.IsEffective,
                      signatureFile = hyhk.SignatureFile,
                      remark = hyhk.Remark,
                      overtimeCoefficient = hyhk.OvertimeCoefficient,
                      originalSgfy = hyhk.OriginalSgfy,
                      overtimeSgfy = hyhk.OvertimeSgfy,
                      appointmentId = hyhk.AppointmentId,
                  })
                  .MergeTable()
                  .OrderBy($"{sidx} {sort}")
                  .ToPagedListAsync(input.currentPage, input.pageSize);
  
              var data = await query;
  
              // 获取当前页的耗卡记录ID列表
              var consumeIds = data.list.Select(x => x.id).ToList();
  
              // 批量查询耗卡明细、健康师业绩、科技部老师业绩、人次记录
              var consumeDetails = new List<LqXhPxmxInfoOutput>();
              var jksyjList = new List<LqXhJksyjInfoOutput>();
              var kjbsyjList = new List<LqXhKjbsyjInfoOutput>();
              var personTimesRecordList = new List<LqPersonTimesRecordListOutput>();
  
              if (consumeIds.Any())
              {
                  consumeDetails = await _db.Queryable<LqXhPxmxEntity>()
                      .Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select(x => new LqXhPxmxInfoOutput
                      {
                          id = x.Id,
                          consumeInfoId = x.ConsumeInfoId,
                          billingItemId = x.BillingItemId,
                          px = x.Px,
                          pxmc = x.Pxmc,
                          pxjg = x.Pxjg,
                          memberId = x.MemberId,
                          createTime = x.CreateTIme,
                          projectNumber = x.ProjectNumber,
                          originalProjectNumber = x.OriginalProjectNumber,
                          overtimeProjectNumber = x.OvertimeProjectNumber,
                          sourceType = x.SourceType,
                          totalPrice = x.TotalPrice,
                          isEffective = x.IsEffective,
                      })
                      .ToListAsync();
  
                  jksyjList = await _db.Queryable<LqXhJksyjEntity>()
                      .Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select(x => new LqXhJksyjInfoOutput
                      {
                          id = x.Id,
                          glkdbh = x.Glkdbh,
                          jks = x.Jks,
                          jkszh = x.Jkszh,
                          jksxm = x.Jksxm,
                          jksyj = SqlFunc.ToString(x.Jksyj),
                          yjsj = x.Yjsj,
                          jsjId = x.JsjId,
                          kdpxid = x.Kdpxid,
                          laborCost = x.LaborCost,
                          kdpxNumber = x.KdpxNumber,
                          originalKdpxNumber = x.OriginalKdpxNumber,
                          overtimeKdpxNumber = x.OvertimeKdpxNumber,
                          originalLaborCost = x.OriginalLaborCost,
                          overtimeLaborCost = x.OvertimeLaborCost,
                          isAccompanied = x.IsAccompanied,
                          accompaniedProjectNumber = x.AccompaniedProjectNumber,
                      })
                      .ToListAsync();
  
                  kjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>()
                      .Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select(x => new LqXhKjbsyjInfoOutput
                      {
                          id = x.Id,
                          glkdbh = x.Glkdbh,
                          kjbls = x.Kjbls,
                          kjblszh = x.Kjblszh,
                          kjblsxm = x.Kjblsxm,
                          kjblsyj = SqlFunc.ToString(x.Kjblsyj),
                          yjsj = x.Yjsj,
                          hkpxid = x.Hkpxid,
                          laborCost = x.LaborCost,
                          hdpxNumber = x.HdpxNumber,
                          originalHdpxNumber = x.OriginalHdpxNumber,
                          overtimeHdpxNumber = x.OvertimeHdpxNumber,
                          originalLaborCost = x.OriginalLaborCost,
                          overtimeLaborCost = x.OvertimeLaborCost,
                      })
                      .ToListAsync();
  
                  personTimesRecordList = await _db.Queryable<LqPersonTimesRecordEntity>()
                      .Where(x => consumeIds.Contains(x.BusinessId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select(x => new LqPersonTimesRecordListOutput
                      {
                          id = x.Id,
                          businessId = x.BusinessId,
                          businessType = x.BusinessType,
                          hasBilling = x.HasBilling,
                          personType = x.PersonType,
                          personId = x.PersonId,
                          personName = x.PersonName,
                          memberId = x.MemberId,
                          memberName = x.MemberName,
                          workDate = x.WorkDate,
                          workMonth = x.WorkMonth,
                          quantity = x.Quantity,
                          createTime = x.CreateTime,
                          isEffective = x.IsEffective,
                      })
                      .ToListAsync();
              }
  
              // 按耗卡记录ID分组
              var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
                  .ToDictionary(g => g.Key, g => g.ToList());
              var jksyjGrouped = jksyjList.GroupBy(x => x.glkdbh)
                  .ToDictionary(g => g.Key, g => g.ToList());
              var kjbsyjGrouped = kjbsyjList.GroupBy(x => x.glkdbh)
                  .ToDictionary(g => g.Key, g => g.ToList());
              var personTimesRecordGrouped = personTimesRecordList.GroupBy(x => x.businessId)
                  .ToDictionary(g => g.Key, g => g.ToList());
  
              foreach (var item in data.list)
              {
                  item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
                      ? consumeDetailsGrouped[item.id]
                      : new List<LqXhPxmxInfoOutput>();
                  item.lqXhJksyjList = jksyjGrouped.ContainsKey(item.id)
                      ? jksyjGrouped[item.id]
                      : new List<LqXhJksyjInfoOutput>();
                  item.lqXhKjbsyjList = kjbsyjGrouped.ContainsKey(item.id)
                      ? kjbsyjGrouped[item.id]
                      : new List<LqXhKjbsyjInfoOutput>();
                  item.personTimesRecordList = personTimesRecordGrouped.ContainsKey(item.id)
                      ? personTimesRecordGrouped[item.id]
                      : new List<LqPersonTimesRecordListOutput>();
              }
  
              return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
          }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
610
611
          #endregion
  
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
          #region 根据健康师ID获取耗卡列表
          /// <summary>
          /// 根据健康师ID获取耗卡列表
          /// </summary>
          /// <remarks>
          /// 根据健康师ID查询该健康师参与的所有耗卡记录,支持时间周期查询和分页
          /// 
          /// 示例请求:
          /// GET /api/Extend/LqXhHyhk/GetListByJksId?jksId=健康师ID&amp;startTime=2025-01-01&amp;endTime=2025-01-31&amp;currentPage=1&amp;pageSize=10
          /// 
          /// 参数说明:
          /// - jksId: 健康师ID(必填)
          /// - startTime: 开始时间(可选,格式:yyyy-MM-dd  yyyy-MM-dd HH:mm:ss
          /// - endTime: 结束时间(可选,格式:yyyy-MM-dd  yyyy-MM-dd HH:mm:ss
          /// - md: 门店ID(可选)
          /// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认1
          /// - currentPage: 当前页码(必填)
          /// - pageSize: 每页数量(必填)
          /// 
          /// 返回说明:
          /// - 返回格式与GetList接口相同,包含耗卡基本信息及耗卡明细列表
          /// </remarks>
          /// <param name="input">查询参数</param>
          /// <returns>耗卡列表(分页)</returns>
          /// <response code="200">查询成功</response>
          /// <response code="400">参数错误</response>
          /// <response code="500">服务器内部错误</response>
          [HttpGet("GetListByJksId")]
          public async Task<dynamic> GetListByJksId([FromQuery] LqXhHyhkListByJksQueryInput input)
          {
              try
              {
                  if (string.IsNullOrEmpty(input.jksId))
                  {
                      throw NCCException.Oh("健康师ID不能为空");
                  }
  
                  var sidx = input.sidx == null ? "hksj" : input.sidx;
                  var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
  
                  // 解析时间范围
                  DateTime? startDate = null;
                  DateTime? endDate = null;
                  if (!string.IsNullOrEmpty(input.startTime))
                  {
                      startDate = Ext.GetDateTime(input.startTime);
                  }
                  if (!string.IsNullOrEmpty(input.endTime))
                  {
                      endDate = Ext.GetDateTime(input.endTime);
                      // 如果只传了日期,则设置为当天的23:59:59
                      if (endDate.HasValue && !input.endTime.Contains(":"))
                      {
                          endDate = new DateTime(endDate.Value.Year, endDate.Value.Month, endDate.Value.Day, 23, 59, 59);
                      }
                  }
  
                  // 通过健康师业绩表关联查询耗卡记录
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
670
                  var data = await _db.Queryable<LqXhJksyjEntity, LqXhHyhkEntity>((jksyj, hyhk) => jksyj.Glkdbh == hyhk.Id)
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
                      .Where((jksyj, hyhk) => jksyj.Jkszh == input.jksId)
                      .WhereIF(input.isEffective != 0, (jksyj, hyhk) => jksyj.IsEffective == input.isEffective && hyhk.IsEffective == input.isEffective)
                      .WhereIF(input.isEffective == 0, (jksyj, hyhk) => jksyj.IsEffective == StatusEnum.有效.GetHashCode() && hyhk.IsEffective == StatusEnum.有效.GetHashCode())
                      .WhereIF(startDate.HasValue, (jksyj, hyhk) => hyhk.Hksj >= startDate.Value)
                      .WhereIF(endDate.HasValue, (jksyj, hyhk) => hyhk.Hksj <= endDate.Value)
                      .WhereIF(!string.IsNullOrEmpty(input.md), (jksyj, hyhk) => hyhk.Md == input.md)
                      .Select((jksyj, hyhk) => new LqXhHyhkListOutput
                      {
                          id = hyhk.Id,
                          md = hyhk.Md,
                          mdbh = hyhk.Mdbh,
                          mdmc = hyhk.Mdmc,
                          hy = hyhk.Hy,
                          hyzh = hyhk.Hyzh,
                          hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Khmc),
                          gklx = hyhk.Gklx,
9c60e8ba   “wangming”   ```
687
                          jdqd = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Jdqd),
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
688
689
690
691
692
693
694
695
                          xfje = SqlFunc.ToString(hyhk.Xfje),
                          sgfy = SqlFunc.ToString(hyhk.Sgfy),
                          sfykjb = hyhk.Sfykjb,
                          hksj = hyhk.Hksj,
                          czry = hyhk.Czry,
                          memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Sjh),
                          isEffective = hyhk.IsEffective,
                          signatureFile = hyhk.SignatureFile,
55bd8d57   “wangming”   fix: 修复全员战报明细到店数统...
696
                          remark = hyhk.Remark,
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
697
698
699
700
701
702
703
704
705
                          overtimeCoefficient = hyhk.OvertimeCoefficient,
                          originalSgfy = hyhk.OriginalSgfy,
                          overtimeSgfy = hyhk.OvertimeSgfy,
                      })
                      .MergeTable()
                      .Distinct() // 去重,因为一个耗卡可能对应多个健康师业绩记录
                      .OrderBy($"{sidx} {sort}")
                      .ToPagedListAsync(input.currentPage, input.pageSize);
  
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
706
707
  
  
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
708
709
                  // 获取当前页的耗卡记录ID列表
                  var consumeIds = data.list.Select(x => x.id).ToList();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
                  // 获取人次记录列表
                  var personTimesRecordList = await _db.Queryable<LqPersonTimesRecordEntity>().Where(x => consumeIds.Contains(x.BusinessId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select(x => new LqPersonTimesRecordListOutput
                      {
                          id = x.Id,
                          businessId = x.BusinessId,
                          businessType = x.BusinessType,
                          personType = x.PersonType,
                          personId = x.PersonId,
                          personName = x.PersonName,
                          memberId = x.MemberId,
                          memberName = x.MemberName,
                          workDate = x.WorkDate,
                          workMonth = x.WorkMonth,
                          quantity = x.Quantity,
                          createTime = x.CreateTime,
                          isEffective = x.IsEffective,
                      })
                      .ToListAsync();
                  // 按耗卡记录ID分组人次记录
                  var personTimesRecordGrouped = personTimesRecordList.GroupBy(x => x.businessId).ToDictionary(g => g.Key, g => g.ToList());
                  // 为每个耗卡记录分配人次记录
                  foreach (var item in data.list)
                  {
                      item.personTimesRecordList = personTimesRecordGrouped.ContainsKey(item.id) ? personTimesRecordGrouped[item.id] : new List<LqPersonTimesRecordListOutput>();
                  }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
736
737
738
739
                  // 批量查询耗卡明细
                  var consumeDetails = new List<LqXhPxmxInfoOutput>();
                  if (consumeIds.Any())
                  {
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
740
                      consumeDetails = await _db.Queryable<LqXhPxmxEntity>().Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
                          .Select(x => new LqXhPxmxInfoOutput
                          {
                              id = x.Id,
                              consumeInfoId = x.ConsumeInfoId,
                              billingItemId = x.BillingItemId,
                              px = x.Px,
                              pxmc = x.Pxmc,
                              pxjg = x.Pxjg,
                              memberId = x.MemberId,
                              createTime = x.CreateTIme,
                              projectNumber = x.ProjectNumber,
                              originalProjectNumber = x.OriginalProjectNumber,
                              overtimeProjectNumber = x.OvertimeProjectNumber,
                              sourceType = x.SourceType,
                              totalPrice = x.TotalPrice,
                              isEffective = x.IsEffective,
                          })
                          .ToListAsync();
                  }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
760
                  // 按耗卡记录ID分组耗卡明细
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
761
                  var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId).ToDictionary(g => g.Key, g => g.ToList());
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
762
763
764
                  // 为每个耗卡记录分配耗卡明细
                  foreach (var item in data.list)
                  {
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
765
                      item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id) ? consumeDetailsGrouped[item.id] : new List<LqXhPxmxInfoOutput>();
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
766
                  }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
                  return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, $"根据健康师ID获取耗卡列表失败 - 健康师ID: {input?.jksId}, 开始时间: {input?.startTime}, 结束时间: {input?.endTime}");
                  throw NCCException.Oh($"根据健康师ID获取耗卡列表失败: {ex.Message}");
              }
          }
          #endregion
  
          #region 根据科技部老师ID获取耗卡列表
          /// <summary>
          /// 根据科技部老师ID获取耗卡列表
          /// </summary>
          /// <remarks>
          /// 根据科技部老师ID查询该老师参与的所有耗卡记录,支持时间周期查询和分页
          /// 
          /// 示例请求:
          /// GET /api/Extend/LqXhHyhk/GetListByKjbId?kjblsId=科技部老师ID&amp;startTime=2025-01-01&amp;endTime=2025-01-31&amp;currentPage=1&amp;pageSize=10
          /// 
          /// 参数说明:
          /// - kjblsId: 科技部老师ID(必填)
          /// - startTime: 开始时间(可选,格式:yyyy-MM-dd  yyyy-MM-dd HH:mm:ss
          /// - endTime: 结束时间(可选,格式:yyyy-MM-dd  yyyy-MM-dd HH:mm:ss
          /// - md: 门店ID(可选)
          /// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认1
          /// - currentPage: 当前页码(必填)
          /// - pageSize: 每页数量(必填)
          /// 
          /// 返回说明:
          /// - 返回格式与GetList接口相同,包含耗卡基本信息及耗卡明细列表
          /// </remarks>
          /// <param name="input">查询参数</param>
          /// <returns>耗卡列表(分页)</returns>
          /// <response code="200">查询成功</response>
          /// <response code="400">参数错误</response>
          /// <response code="500">服务器内部错误</response>
          [HttpGet("GetListByKjbId")]
          public async Task<dynamic> GetListByKjbId([FromQuery] LqXhHyhkListByKjbQueryInput input)
          {
              try
              {
                  if (string.IsNullOrEmpty(input.kjblsId))
                  {
                      throw NCCException.Oh("科技部老师ID不能为空");
                  }
  
                  var sidx = input.sidx == null ? "hksj" : input.sidx;
                  var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
  
                  // 解析时间范围
                  DateTime? startDate = null;
                  DateTime? endDate = null;
                  if (!string.IsNullOrEmpty(input.startTime))
                  {
                      startDate = Ext.GetDateTime(input.startTime);
                  }
                  if (!string.IsNullOrEmpty(input.endTime))
                  {
                      endDate = Ext.GetDateTime(input.endTime);
                      // 如果只传了日期,则设置为当天的23:59:59
                      if (endDate.HasValue && !input.endTime.Contains(":"))
                      {
                          endDate = new DateTime(endDate.Value.Year, endDate.Value.Month, endDate.Value.Day, 23, 59, 59);
                      }
                  }
  
                  // 通过科技部老师业绩表关联查询耗卡记录
                  var data = await _db.Queryable<LqXhKjbsyjEntity, LqXhHyhkEntity>(
                          (kjbsyj, hyhk) => kjbsyj.Glkdbh == hyhk.Id)
                      .Where((kjbsyj, hyhk) => kjbsyj.Kjblszh == input.kjblsId)
                      .WhereIF(input.isEffective != 0, (kjbsyj, hyhk) => kjbsyj.IsEffective == input.isEffective && hyhk.IsEffective == input.isEffective)
                      .WhereIF(input.isEffective == 0, (kjbsyj, hyhk) => kjbsyj.IsEffective == StatusEnum.有效.GetHashCode() && hyhk.IsEffective == StatusEnum.有效.GetHashCode())
                      .WhereIF(startDate.HasValue, (kjbsyj, hyhk) => hyhk.Hksj >= startDate.Value)
                      .WhereIF(endDate.HasValue, (kjbsyj, hyhk) => hyhk.Hksj <= endDate.Value)
                      .WhereIF(!string.IsNullOrEmpty(input.md), (kjbsyj, hyhk) => hyhk.Md == input.md)
                      .Select((kjbsyj, hyhk) => new LqXhHyhkListOutput
                      {
                          id = hyhk.Id,
                          md = hyhk.Md,
                          mdbh = hyhk.Mdbh,
                          mdmc = hyhk.Mdmc,
                          hy = hyhk.Hy,
                          hyzh = hyhk.Hyzh,
                          hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Khmc),
                          gklx = hyhk.Gklx,
9c60e8ba   “wangming”   ```
853
                          jdqd = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Jdqd),
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
854
855
856
857
858
859
860
861
                          xfje = SqlFunc.ToString(hyhk.Xfje),
                          sgfy = SqlFunc.ToString(hyhk.Sgfy),
                          sfykjb = hyhk.Sfykjb,
                          hksj = hyhk.Hksj,
                          czry = hyhk.Czry,
                          memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Sjh),
                          isEffective = hyhk.IsEffective,
                          signatureFile = hyhk.SignatureFile,
55bd8d57   “wangming”   fix: 修复全员战报明细到店数统...
862
                          remark = hyhk.Remark,
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
863
864
865
866
867
868
869
                          overtimeCoefficient = hyhk.OvertimeCoefficient,
                          originalSgfy = hyhk.OriginalSgfy,
                          overtimeSgfy = hyhk.OvertimeSgfy,
                      })
                      .MergeTable()
                      .Distinct() // 去重,因为一个耗卡可能对应多个科技部老师业绩记录
                      .OrderBy($"{sidx} {sort}")
96e0ccc7   “wangming”   优化GetBillingRecor...
870
                  .ToPagedListAsync(input.currentPage, input.pageSize);
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
871
  
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
872
873
                  // 获取当前页的耗卡记录ID列表
                  var consumeIds = data.list.Select(x => x.id).ToList();
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
874
  
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
                  // 批量查询耗卡明细
                  var consumeDetails = new List<LqXhPxmxInfoOutput>();
                  if (consumeIds.Any())
                  {
                      consumeDetails = await _db.Queryable<LqXhPxmxEntity>()
                          .Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                          .Select(x => new LqXhPxmxInfoOutput
                          {
                              id = x.Id,
                              consumeInfoId = x.ConsumeInfoId,
                              billingItemId = x.BillingItemId,
                              px = x.Px,
                              pxmc = x.Pxmc,
                              pxjg = x.Pxjg,
                              memberId = x.MemberId,
                              createTime = x.CreateTIme,
                              projectNumber = x.ProjectNumber,
                              originalProjectNumber = x.OriginalProjectNumber,
                              overtimeProjectNumber = x.OvertimeProjectNumber,
                              sourceType = x.SourceType,
                              totalPrice = x.TotalPrice,
                              isEffective = x.IsEffective,
                          })
                          .ToListAsync();
                  }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
900
  
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
901
902
903
                  // 按耗卡记录ID分组耗卡明细
                  var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
                      .ToDictionary(g => g.Key, g => g.ToList());
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
904
  
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
905
906
907
908
909
910
911
                  // 为每个耗卡记录分配耗卡明细
                  foreach (var item in data.list)
                  {
                      item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
                          ? consumeDetailsGrouped[item.id]
                          : new List<LqXhPxmxInfoOutput>();
                  }
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
912
  
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
913
                  return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
18e03666   “wangming”   完善耗卡列表接口:修复多表查询别名...
914
915
916
917
918
919
920
921
922
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, $"根据科技部老师ID获取耗卡列表失败 - 科技部老师ID: {input?.kjblsId}, 开始时间: {input?.startTime}, 结束时间: {input?.endTime}");
                  throw NCCException.Oh($"根据科技部老师ID获取耗卡列表失败: {ex.Message}");
              }
          }
          #endregion
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
923
          #region 新建会员耗卡
96009bc9   hexiaodong   hxd
924
925
926
          /// <summary>
          /// 新建会员耗卡
          /// </summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
927
928
          /// <remarks>
          /// 创建会员耗卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
d98270e2   “wangming”   Enhance LqEventSe...
929
          ///
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
          /// 示例请求:
          /// ```json
          /// {
          ///   "hyid": "会员ID",
          ///   "hkmd": "耗卡门店",
          ///   "hksj": "2025-01-11",
          ///   "lqXhPxmxList": [
          ///     {
          ///       "px": "品项编号",
          ///       "pxmc": "品项名称",
          ///       "pxjg": 100.00,
          ///       "projectNumber": 1,
          ///       "xfzs": "否",
          ///       "lqXhJksyjList": [
          ///         {
          ///           "jks": "健康师",
          ///           "jksxm": "健康师姓名",
          ///           "jksyj": "100"
          ///         }
          ///       ]
          ///     }
          ///   ]
          /// }
          /// ```
d98270e2   “wangming”   Enhance LqEventSe...
954
          ///
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
955
956
957
958
959
960
961
962
963
964
          /// 参数说明:
          /// - hyid: 会员ID
          /// - hkmd: 耗卡门店
          /// - lqXhPxmxList: 耗卡品项明细列表
          /// </remarks>
          /// <param name="input">会员耗卡创建参数</param>
          /// <returns>无返回值</returns>
          /// <response code="200">创建成功</response>
          /// <response code="400">参数错误或数据验证失败</response>
          /// <response code="500">服务器内部错误</response>
96009bc9   hexiaodong   hxd
965
966
967
968
          [HttpPost("")]
          public async Task Create([FromBody] LqXhHyhkCrInput input)
          {
              var userInfo = await _userManager.GetUserInfo();
fc259a33   “wangming”   feat: 添加消耗功能加班相关字...
969
              //首先判断当前时间是否是加班时间
96009bc9   hexiaodong   hxd
970
971
              var entity = input.Adapt<LqXhHyhkEntity>();
              entity.Id = YitIdHelper.NextId().ToString();
96009bc9   hexiaodong   hxd
972
              entity.Czry = _userManager.UserId;
3e508db5   “wangming”   优化开单记录作废功能:添加详细错误...
973
              entity.MemberPhone = _db.Queryable<LqKhxxEntity>().Where(w => w.Id == entity.Hy).First().Sjh;
d98270e2   “wangming”   Enhance LqEventSe...
974
              entity.CreateTime = DateTime.Now;
ce74473f   “wangming”   feat: 新增门店类别枚举和耗卡...
975
976
              entity.IsEffective = StatusEnum.有效.GetHashCode();
              entity.UpdateTime = DateTime.Now;
fc259a33   “wangming”   feat: 添加消耗功能加班相关字...
977
              entity.OvertimeCoefficient = input.overtimeCoefficient ?? 0;
01cd603c   “wangming”   refactor: 优化加班计算逻...
978
              entity.OriginalSgfy = input.sgfy;
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
979
              entity.AppointmentId = input.appointmentId;
4b74fde5   “wangming”   Refactor overtime...
980
981
982
983
984
985
              // 加班手工费 = 健康师原始手工费之和 × 加班系数(科技部不参与加班)
              var jksOriginalLaborCostSum = input.lqXhPxmxList?
                  .SelectMany(p => p.lqXhJksyjList ?? Enumerable.Empty<LqXhJksyjCrInput>())
                  .Sum(j => j.laborCost ?? 0) ?? 0;
              entity.OvertimeSgfy = (decimal)(jksOriginalLaborCostSum * entity.OvertimeCoefficient);
              // 最终手工费 = 原始手工费 + 加班手工费
01cd603c   “wangming”   refactor: 优化加班计算逻...
986
              entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
b5df6609   “wangming”   ```
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
  
              LqYyjlEntity appointmentYyjl = null;
              var applyAppointmentTransferredUpdate = false;
              DateTime lineHksj;
              if (!string.IsNullOrEmpty(input.appointmentId))
              {
                  appointmentYyjl = await LoadAndValidateAppointmentForNewConsumeAsync(input, entity, checkDuplicateEffective: true);
                  lineHksj = appointmentYyjl.Yysj!.Value;
                  entity.Hksj = lineHksj;
                  entity.RoomId = appointmentYyjl.RoomId;
                  entity.RoomName = appointmentYyjl.RoomName;
                  applyAppointmentTransferredUpdate = true;
              }
              else
              {
                  if (!input.hksj.HasValue)
                      throw NCCException.Oh("耗卡时间不能为空");
                  lineHksj = input.hksj.Value;
              }
  
96009bc9   hexiaodong   hxd
1007
1008
              try
              {
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1009
                  // 开启事务
96009bc9   hexiaodong   hxd
1010
                  _db.BeginTran();
b5df6609   “wangming”   ```
1011
                  await PerformConsumeInsertCoreAsync(entity, input, lineHksj, appointmentYyjl, applyAppointmentTransferredUpdate);
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1012
                  // 提交事务
96009bc9   hexiaodong   hxd
1013
1014
                  _db.CommitTran();
              }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1015
              catch (Exception ex)
96009bc9   hexiaodong   hxd
1016
              {
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1017
                  // 回滚事务
96009bc9   hexiaodong   hxd
1018
                  _db.RollbackTran();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1019
1020
1021
                  Console.WriteLine($"新建会员耗卡失败: {ex.Message}");
                  Console.WriteLine($"堆栈跟踪: {ex.StackTrace}");
                  throw NCCException.Oh(ErrorCode.COM1000, $"新建会员耗卡失败: {ex.Message}");
96009bc9   hexiaodong   hxd
1022
1023
              }
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1024
          #endregion
96009bc9   hexiaodong   hxd
1025
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1026
          #region 获取会员耗卡无分页列表
96009bc9   hexiaodong   hxd
1027
          /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1028
1029
1030
1031
          /// 获取会员耗卡无分页列表
          /// </summary>
          /// <param name="input">请求参数</param>
          /// <returns></returns>
96009bc9   hexiaodong   hxd
1032
1033
1034
          [NonAction]
          public async Task<dynamic> GetNoPagingList([FromQuery] LqXhHyhkListQueryInput input)
          {
96009bc9   hexiaodong   hxd
1035
1036
1037
              List<string> queryHksj = input.hksj != null ? input.hksj.Split(',').ToObeject<List<string>>() : null;
              DateTime? startHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.First()) : null;
              DateTime? endHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.Last()) : null;
9c60e8ba   “wangming”   ```
1038
1039
1040
              var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
              var orderBy = ResolveHyhkListOrderBy(input.sidx, sort);
              var entities = await _db.Queryable<LqXhHyhkEntity>()
96009bc9   hexiaodong   hxd
1041
1042
1043
1044
1045
1046
1047
1048
                  .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                  .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
                  .WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
                  .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
                  .WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
                  .WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
                  .WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
                  .WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
96009bc9   hexiaodong   hxd
1049
1050
1051
1052
                  .WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
                  .WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
                  .WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
9c60e8ba   “wangming”   ```
1053
                  .OrderBy(orderBy)
d98270e2   “wangming”   Enhance LqEventSe...
1054
                  .ToListAsync();
9c60e8ba   “wangming”   ```
1055
1056
1057
              var outputList = entities.Select(MapHyhkEntityToListOutput).ToList();
              await FillListMemberJdqdAsync(outputList);
              return outputList;
96009bc9   hexiaodong   hxd
1058
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1059
          #endregion
96009bc9   hexiaodong   hxd
1060
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1061
          #region 导出会员耗卡
96009bc9   hexiaodong   hxd
1062
          /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1063
1064
1065
1066
          /// 导出会员耗卡
          /// </summary>
          /// <param name="input">请求参数</param>
          /// <returns></returns>
96009bc9   hexiaodong   hxd
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
          [HttpGet("Actions/Export")]
          public async Task<dynamic> Export([FromQuery] LqXhHyhkListQueryInput input)
          {
              var userInfo = await _userManager.GetUserInfo();
              var exportData = new List<LqXhHyhkListOutput>();
              if (input.dataType == 0)
              {
                  var data = Clay.Object(await this.GetList(input));
                  exportData = data.Solidify<PageResult<LqXhHyhkListOutput>>().list;
              }
              else
              {
                  exportData = await this.GetNoPagingList(input);
              }
d98270e2   “wangming”   Enhance LqEventSe...
1081
              List<ParamsModel> paramList =
9c60e8ba   “wangming”   ```
1082
                  "[{\"value\":\"耗卡编号\",\"field\":\"id\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"门店编号\",\"field\":\"mdbh\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"会员\",\"field\":\"hy\"},{\"value\":\"会员账号\",\"field\":\"hyzh\"},{\"value\":\"会员名称\",\"field\":\"hymc\"},{\"value\":\"顾客类型\",\"field\":\"gklx\"},{\"value\":\"进店渠道\",\"field\":\"jdqd\"},{\"value\":\"消费金额\",\"field\":\"xfje\"},{\"value\":\"手工费用\",\"field\":\"sgfy\"},{\"value\":\"是否有科技部\",\"field\":\"sfykjb\"},{\"value\":\"耗卡时间\",\"field\":\"hksj\"},{\"value\":\"操作人员\",\"field\":\"czry\"},]".ToList<ParamsModel>();
96009bc9   hexiaodong   hxd
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
              ExcelConfig excelconfig = new ExcelConfig();
              excelconfig.FileName = "会员耗卡.xls";
              excelconfig.HeadFont = "微软雅黑";
              excelconfig.HeadPoint = 10;
              excelconfig.IsAllSizeColumn = true;
              excelconfig.ColumnModel = new List<ExcelColumnModel>();
              List<string> selectKeyList = input.selectKey.Split(',').ToList();
              foreach (var item in selectKeyList)
              {
                  var isExist = paramList.Find(p => p.field == item);
                  if (isExist != null)
                  {
                      excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
                  }
              }
              var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
              ExcelExportHelper<LqXhHyhkListOutput>.Export(exportData, excelconfig, addPath);
              var fileName = _userManager.UserId + "|" + addPath + "|xls";
d98270e2   “wangming”   Enhance LqEventSe...
1101
              var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
96009bc9   hexiaodong   hxd
1102
1103
              return output;
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1104
          #endregion
96009bc9   hexiaodong   hxd
1105
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1106
          #region 批量删除会员耗卡
96009bc9   hexiaodong   hxd
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
          /// <summary>
          /// 批量删除会员耗卡
          /// </summary>
          /// <param name="ids">主键数组</param>
          /// <returns></returns>
          [HttpPost("batchRemove")]
          public async Task BatchRemove([FromBody] List<string> ids)
          {
              var entitys = await _db.Queryable<LqXhHyhkEntity>().In(it => it.Id, ids).ToListAsync();
              if (entitys.Count > 0)
              {
                  try
                  {
                      //开启事务
                      _db.BeginTran();
                      //批量删除会员耗卡
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1123
                      await _db.Deleteable<LqXhHyhkEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
96009bc9   hexiaodong   hxd
1124
1125
  
                      //清空子表数据
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1126
                      await _db.Deleteable<LqXhJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
96009bc9   hexiaodong   hxd
1127
1128
  
                      //清空子表数据
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1129
                      await _db.Deleteable<LqXhKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
96009bc9   hexiaodong   hxd
1130
1131
  
                      //清空子表数据
b45d55f7   “wangming”   Refactor LqEventS...
1132
                      await _db.Deleteable<LqXhPxmxEntity>().In(u => u.ConsumeInfoId, ids).ExecuteCommandAsync();
96009bc9   hexiaodong   hxd
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
                      //关闭事务
                      _db.CommitTran();
                  }
                  catch (Exception)
                  {
                      //回滚事务
                      _db.RollbackTran();
                      throw NCCException.Oh(ErrorCode.COM1002);
                  }
              }
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1144
          #endregion
96009bc9   hexiaodong   hxd
1145
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1146
          #region 更新会员耗卡
96009bc9   hexiaodong   hxd
1147
          /// <summary>
ce74473f   “wangming”   feat: 新增门店类别枚举和耗卡...
1148
          /// 更新会员耗卡
96009bc9   hexiaodong   hxd
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
          /// </summary>
          /// <param name="id">主键</param>
          /// <param name="input">参数</param>
          /// <returns></returns>
          [HttpPut("{id}")]
          public async Task Update(string id, [FromBody] LqXhHyhkUpInput input)
          {
              var entity = input.Adapt<LqXhHyhkEntity>();
              try
              {
                  //开启事务
                  _db.BeginTran();
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1161
1162
1163
1164
1165
1166
                  //查询记录
                  var LqXhHyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
                  if (LqXhHyhkInfo == null)
                  {
                      throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
                  }
b5df6609   “wangming”   ```
1167
1168
1169
  
                  await ConsumeEditableDaysHelper.EnsureConsumeWithinEditableWindowAsync(_db, LqXhHyhkInfo);
  
d98270e2   “wangming”   Enhance LqEventSe...
1170
                  entity.UpdateTime = DateTime.Now;
4b74fde5   “wangming”   Refactor overtime...
1171
                  entity.OvertimeCoefficient = input.overtimeCoefficient ?? 0;
01cd603c   “wangming”   refactor: 优化加班计算逻...
1172
                  entity.OriginalSgfy = input.sgfy;
4b74fde5   “wangming”   Refactor overtime...
1173
1174
1175
1176
1177
                  // 加班手工费 = 健康师原始手工费之和 × 加班系数(科技部不参与加班)
                  var jksOriginalLaborCostSum = input.lqXhPxmxList?
                      .SelectMany(p => p.lqXhJksyjList ?? Enumerable.Empty<LqXhJksyjCrInput>())
                      .Sum(j => j.laborCost ?? 0) ?? 0;
                  entity.OvertimeSgfy = (decimal)(jksOriginalLaborCostSum * (entity.OvertimeCoefficient ?? 0));
e09804e2   “wangming”   fix: 更新消耗服务相关代码
1178
                  entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1179
                  entity.AppointmentId = input.appointmentId;
96009bc9   hexiaodong   hxd
1180
1181
1182
                  //更新会员耗卡记录
                  await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
  
e97f24a6   “wangming”   feat: 新增开单品项明细记录列...
1183
1184
1185
1186
1187
1188
                  var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(w => w.Id == entity.Hy).FirstAsync();
                  //如果会员类型是线索,那么就更新为新客
                  if (memberInfo.Khlx == MemberTypeEnum.线索.GetHashCode().ToString())
                  {
                      memberInfo.Khlx = MemberTypeEnum.新客.GetHashCode().ToString();
                  }
6aa6629d   “wangming”   优化会员列表卡片视图样式和功能
1189
1190
1191
1192
1193
                  // 如果消费金额大于0,更新最后消费时间(用于沉睡天数计算)
                  if (entity.Xfje > 0)
                  {
                      memberInfo.LastConsumeTime = entity.Hksj;
                  }
e97f24a6   “wangming”   feat: 新增开单品项明细记录列...
1194
1195
1196
                  //保存会员信息
                  await _db.Updateable(memberInfo).ExecuteCommandAsync();
  
96009bc9   hexiaodong   hxd
1197
1198
                  //清空原有数据
                  await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1199
                  await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1200
                  await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1201
                  await _db.Deleteable<LqPersonTimesRecordEntity>().Where(u => u.BusinessId == id).ExecuteCommandAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1202
1203
1204
1205
                  // 收集所有需要插入的实体,然后批量插入
                  var allPxmxEntities = new List<LqXhPxmxEntity>();
                  var allJksyjEntities = new List<LqXhJksyjEntity>();
                  var allKjbsyjEntities = new List<LqXhKjbsyjEntity>();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1206
                  var allPersonTimesRecordEntities = new List<LqPersonTimesRecordEntity>();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1207
1208
                  // 处理品项明细列表
                  if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any())
96009bc9   hexiaodong   hxd
1209
                  {
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1210
                      foreach (var item in input.lqXhPxmxList)
96009bc9   hexiaodong   hxd
1211
                      {
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1212
1213
                          // 创建品项明细实体
                          var lqXhPxmxEntity = new LqXhPxmxEntity
d7925aaa   “wangming”   星期五了,下班咯
1214
                          {
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1215
1216
1217
1218
                              Id = YitIdHelper.NextId().ToString(),
                              ConsumeInfoId = input.id,
                              BillingItemId = item.billingItemId,
                              CreateTIme = DateTime.Now,
fea13b4d   “wangming”   feat: 同步耗卡时间和创建时间字段
1219
                              Yjsj = input.hksj,
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1220
                              MemberId = entity.Hy,
01cd603c   “wangming”   refactor: 优化加班计算逻...
1221
                              TotalPrice = item.pxjg * (item.projectNumber ?? 1),
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1222
1223
1224
1225
                              Px = item.px,
                              Pxmc = item.pxmc,
                              Pxjg = item.pxjg,
                              SourceType = item.sourceType,
01cd603c   “wangming”   refactor: 优化加班计算逻...
1226
1227
1228
1229
                              IsEffective = StatusEnum.有效.GetHashCode(),
                              OriginalProjectNumber = item.projectNumber ?? 0,
                              OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)),
                              ProjectNumber = (decimal)((item.projectNumber ?? 0) + (entity.OvertimeCoefficient * (item.projectNumber ?? 0))),
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1230
                              ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
3f8b942f   “wangming”   feat: 添加业绩类型字段并修复...
1231
                              PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
ac25ff12   “wangming”   feat: 添加大项目部老师工资计...
1232
                              BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.BeautyType).FirstAsync(),
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1233
                          };
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1234
                          allPxmxEntities.Add(lqXhPxmxEntity);
d98270e2   “wangming”   Enhance LqEventSe...
1235
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1236
1237
1238
1239
1240
                          // 收集该品项关联的健康师业绩
                          if (item.lqXhJksyjList != null && item.lqXhJksyjList.Any())
                          {
                              foreach (var ijks_tem in item.lqXhJksyjList)
                              {
d98270e2   “wangming”   Enhance LqEventSe...
1241
1242
1243
1244
                                  allJksyjEntities.Add(
                                      new LqXhJksyjEntity
                                      {
                                          Id = YitIdHelper.NextId().ToString(),
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1245
                                          Glkdbh = input.id,
d98270e2   “wangming”   Enhance LqEventSe...
1246
1247
1248
1249
                                          Jks = ijks_tem.jks,
                                          Jksxm = ijks_tem.jksxm,
                                          Jkszh = ijks_tem.jkszh,
                                          Jksyj = ijks_tem.jksyj,
fea13b4d   “wangming”   feat: 同步耗卡时间和创建时间字段
1250
1251
                                          Yjsj = input.hksj,
                                          CreateTime = DateTime.Now,
d98270e2   “wangming”   Enhance LqEventSe...
1252
1253
                                          JsjId = ijks_tem.jsjId,
                                          Kdpxid = lqXhPxmxEntity.Id,
01cd603c   “wangming”   refactor: 优化加班计算逻...
1254
1255
                                          OriginalKdpxNumber = ijks_tem.kdpxNumber,
                                          OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)),
3ab6f199   “wangming”   feat: 创建门店目标表和总经理...
1256
                                          KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0),
e09804e2   “wangming”   fix: 更新消耗服务相关代码
1257
1258
1259
                                          OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
                                          LaborCost = ijks_tem.laborCost + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
                                          OriginalLaborCost = ijks_tem.laborCost,
01cd603c   “wangming”   refactor: 优化加班计算逻...
1260
                                          IsEffective = StatusEnum.有效.GetHashCode(),
3ab6f199   “wangming”   feat: 创建门店目标表和总经理...
1261
1262
                                          IsAccompanied = ijks_tem.isAccompanied,
                                          AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber,
8514f465   “wangming”   feat: 优化业务逻辑和功能完善
1263
1264
                                          ItemCategory = lqXhPxmxEntity.ItemCategory,
                                          ItemId = lqXhPxmxEntity.Px,
7e362a14   “wangming”   feat: 为业绩表添加门店ID和...
1265
                                          StoreId = entity.Md,
3f8b942f   “wangming”   feat: 添加业绩类型字段并修复...
1266
                                          ItemName = lqXhPxmxEntity.Pxmc,
ac25ff12   “wangming”   feat: 添加大项目部老师工资计...
1267
1268
                                          PerformanceType = lqXhPxmxEntity.PerformanceType,
                                          BeautyType = lqXhPxmxEntity.BeautyType,
d98270e2   “wangming”   Enhance LqEventSe...
1269
1270
                                      }
                                  );
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1271
1272
                              }
                          }
d98270e2   “wangming”   Enhance LqEventSe...
1273
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1274
1275
1276
1277
1278
                          // 收集该品项关联的科技部老师业绩
                          if (item.lqXhKjbsyjList != null && item.lqXhKjbsyjList.Any())
                          {
                              foreach (var ikjbs_tem in item.lqXhKjbsyjList)
                              {
1cf1bd86   “wangming”   feat: 添加项目资料表手工费字...
1279
1280
1281
1282
1283
1284
1285
1286
                                  allKjbsyjEntities.Add(new LqXhKjbsyjEntity
                                  {
                                      Id = YitIdHelper.NextId().ToString(),
                                      Glkdbh = input.id,
                                      Kjbls = ikjbs_tem.kjbls,
                                      Kjblsxm = ikjbs_tem.kjblsxm,
                                      Kjblszh = ikjbs_tem.kjblszh,
                                      Kjblsyj = ikjbs_tem.kjblsyj,
fea13b4d   “wangming”   feat: 同步耗卡时间和创建时间字段
1287
1288
                                      Yjsj = input.hksj,
                                      CreateTime = DateTime.Now,
1cf1bd86   “wangming”   feat: 添加项目资料表手工费字...
1289
                                      Hkpxid = lqXhPxmxEntity.Id,
a78c0ae8   “wangming”   feat: 退卡服务添加健康师和科...
1290
1291
1292
1293
1294
1295
                                      // OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
                                      // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)),
                                      // HdpxNumber = (decimal)((ikjbs_tem.hdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0))),
                                      // OriginalLaborCost = ikjbs_tem.laborCost,
                                      // OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0)),
                                      // LaborCost = (decimal)((ikjbs_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0))),
1cf1bd86   “wangming”   feat: 添加项目资料表手工费字...
1296
                                      OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
a78c0ae8   “wangming”   feat: 退卡服务添加健康师和科...
1297
1298
                                      OvertimeHdpxNumber = 0,
                                      HdpxNumber = ikjbs_tem.hdpxNumber,
1cf1bd86   “wangming”   feat: 添加项目资料表手工费字...
1299
                                      OriginalLaborCost = ikjbs_tem.laborCost,
a78c0ae8   “wangming”   feat: 退卡服务添加健康师和科...
1300
1301
                                      OvertimeLaborCost = 0,
                                      LaborCost = ikjbs_tem.laborCost,
1cf1bd86   “wangming”   feat: 添加项目资料表手工费字...
1302
                                      IsEffective = StatusEnum.有效.GetHashCode(),
8514f465   “wangming”   feat: 优化业务逻辑和功能完善
1303
1304
                                      ItemCategory = lqXhPxmxEntity.ItemCategory,
                                      ItemId = lqXhPxmxEntity.Px,
7e362a14   “wangming”   feat: 为业绩表添加门店ID和...
1305
                                      StoreId = entity.Md,
3f8b942f   “wangming”   feat: 添加业绩类型字段并修复...
1306
                                      ItemName = lqXhPxmxEntity.Pxmc,
ac25ff12   “wangming”   feat: 添加大项目部老师工资计...
1307
1308
                                      PerformanceType = lqXhPxmxEntity.PerformanceType,
                                      BeautyType = lqXhPxmxEntity.BeautyType,
1cf1bd86   “wangming”   feat: 添加项目资料表手工费字...
1309
                                  });
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1310
1311
                              }
                          }
96009bc9   hexiaodong   hxd
1312
                      }
96009bc9   hexiaodong   hxd
1313
                  }
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
1314
1315
                  //查询开单记录
                  var billingRecord = await _db.Queryable<LqKdKdjlbEntity>().Where(x => x.Kdhy == entity.Hy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.Sfyj > 0).AnyAsync();
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1316
1317
                  //剔除所有T区健康师(姓名中包含"T区"的健康师)
                  var NoTallJksyjEntities = allJksyjEntities.Where(x => x.Jks != null && x.Jks != "" && (x.Jksxm == null || !x.Jksxm.Contains("T区"))).ToList();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1318
                  //获取这次耗卡有多少个健康师
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1319
                  var jksCount = NoTallJksyjEntities.GroupBy(x => x.Jks).Count();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1320
                  //添加到人次表里面去
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1321
                  foreach (var item in NoTallJksyjEntities.Select(x => x.Jks).Distinct())
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1322
1323
1324
1325
1326
1327
1328
1329
                  {
                      LqPersonTimesRecordEntity personTimesRecordEntity = new LqPersonTimesRecordEntity
                      {
                          Id = YitIdHelper.NextId().ToString(),
                          BusinessId = input.id,
                          BusinessType = "耗卡",
                          PersonType = "健康师",
                          PersonId = item,
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1330
                          PersonName = NoTallJksyjEntities.Where(x => x.Jks == item).Select(x => x.Jksxm).First(),
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1331
1332
1333
1334
1335
1336
1337
                          MemberId = entity.Hy,
                          MemberName = memberInfo.Khmc,
                          WorkDate = input.hksj,
                          WorkMonth = input.hksj.ToDate().ToString("yyyyMM"),
                          Quantity = 1 / (decimal)jksCount,
                          CreateTime = DateTime.Now,
                          IsEffective = StatusEnum.有效.GetHashCode(),
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
1338
                          HasBilling = billingRecord ? 1 : 0,
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1339
1340
1341
                      };
                      allPersonTimesRecordEntities.Add(personTimesRecordEntity);
                  }
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1342
1343
                  //剔除所有T区科技部老师(姓名中包含"T区"的科技部老师)
                  var NoTallKjbsyjEntities = allKjbsyjEntities.Where(x => x.Kjbls != null && x.Kjbls != "" && (x.Kjblsxm == null || !x.Kjblsxm.Contains("T区"))).ToList();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1344
                  //获取这次耗卡有多少个科技部老师
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1345
                  var kjbCount = NoTallKjbsyjEntities.GroupBy(x => x.Kjbls).Count();
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1346
                  //添加到人次表里面去
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1347
                  foreach (var item in NoTallKjbsyjEntities.Select(x => x.Kjbls).Distinct())
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1348
1349
1350
1351
1352
1353
1354
1355
                  {
                      LqPersonTimesRecordEntity personTimesRecordEntity = new LqPersonTimesRecordEntity
                      {
                          Id = YitIdHelper.NextId().ToString(),
                          BusinessId = input.id,
                          BusinessType = "耗卡",
                          PersonType = "科技部老师",
                          PersonId = item,
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1356
                          PersonName = NoTallKjbsyjEntities.Where(x => x.Kjbls == item).Select(x => x.Kjblsxm).First(),
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1357
1358
1359
1360
1361
1362
1363
                          MemberId = entity.Hy,
                          MemberName = memberInfo.Khmc,
                          WorkDate = input.hksj,
                          WorkMonth = input.hksj.ToDate().ToString("yyyyMM"),
                          Quantity = 1 / (decimal)kjbCount,
                          CreateTime = DateTime.Now,
                          IsEffective = StatusEnum.有效.GetHashCode(),
910e21a0   “wangming”   修复开单记录汇总筛选逻辑:当传入筛...
1364
                          HasBilling = billingRecord ? 1 : 0,
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1365
1366
1367
1368
1369
1370
1371
1372
                      };
                      allPersonTimesRecordEntities.Add(personTimesRecordEntity);
                  }
                  // 批量插入人次记录
                  if (allPersonTimesRecordEntities.Any())
                  {
                      await _db.Insertable(allPersonTimesRecordEntities).ExecuteCommandAsync();
                  }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1373
1374
                  // 批量插入品项明细
                  if (allPxmxEntities.Any())
96009bc9   hexiaodong   hxd
1375
                  {
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1376
                      await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
                  }
                  // 批量插入健康师业绩
                  if (allJksyjEntities.Any())
                  {
                      await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
                  }
                  // 批量插入科技部老师业绩
                  if (allKjbsyjEntities.Any())
                  {
                      await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
96009bc9   hexiaodong   hxd
1387
                  }
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1388
                  // 提交事务
96009bc9   hexiaodong   hxd
1389
1390
                  _db.CommitTran();
              }
b5df6609   “wangming”   ```
1391
              catch (Exception ex)
96009bc9   hexiaodong   hxd
1392
              {
96009bc9   hexiaodong   hxd
1393
                  _db.RollbackTran();
b5df6609   “wangming”   ```
1394
1395
                  if (ex is AppFriendlyException)
                      throw;
96009bc9   hexiaodong   hxd
1396
1397
1398
                  throw NCCException.Oh(ErrorCode.COM1001);
              }
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1399
          #endregion
96009bc9   hexiaodong   hxd
1400
  
55bd8d57   “wangming”   fix: 修复全员战报明细到店数统...
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
          #region 更新耗卡备注
          /// <summary>
          /// 更新耗卡备注
          /// </summary>
          /// <remarks>
          /// 专门用于更新耗卡记录的备注信息
          /// 
          /// 示例请求:
          /// PUT /api/Extend/LqXhHyhk/{id}/UpdateRemark
          /// 
          /// 请求体:
          /// ```json
          /// {
          ///   "remark": "备注信息(最大2000字符)"
          /// }
          /// ```
          /// </remarks>
          /// <param name="id">耗卡记录ID</param>
          /// <param name="input">备注信息</param>
          /// <returns>无返回值</returns>
          /// <response code="200">更新成功</response>
          /// <response code="400">参数错误</response>
          /// <response code="404">耗卡记录不存在</response>
          /// <response code="500">服务器错误</response>
          [HttpPut("{id}/UpdateRemark")]
          public async Task UpdateRemark(string id, [FromBody] LqXhHyhkUpdateRemarkInput input)
          {
              try
              {
                  // 查询记录
                  var entity = await _db.Queryable<LqXhHyhkEntity>()
                      .Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode())
                      .FirstAsync();
                  
                  if (entity == null)
                  {
                      throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
                  }
  
                  // 更新备注
                  entity.Remark = input.remark;
                  entity.UpdateTime = DateTime.Now;
  
                  // 保存更新
                  await _db.Updateable(entity)
                      .UpdateColumns(it => new { it.Remark, it.UpdateTime })
                      .ExecuteCommandAsync();
  
                  _logger.LogInformation($"更新耗卡备注成功,ID:{id}");
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, "更新耗卡备注失败,ID:{Id}", id);
                  throw;
              }
          }
          #endregion
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1459
          #region 删除会员耗卡
96009bc9   hexiaodong   hxd
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
          /// <summary>
          /// 删除会员耗卡
          /// </summary>
          /// <returns></returns>
          [HttpDelete("{id}")]
          public async Task Delete(string id)
          {
              var entity = await _db.Queryable<LqXhHyhkEntity>().FirstAsync(p => p.Id == id);
              _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
              try
              {
                  //开启事务
                  _db.BeginTran();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1473
  
96009bc9   hexiaodong   hxd
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
                  //删除会员耗卡记录
                  await _db.Deleteable<LqXhHyhkEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
  
                  //清空子表数据
                  await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
  
                  //清空子表数据
                  await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
  
                  //清空子表数据
b45d55f7   “wangming”   Refactor LqEventS...
1484
                  await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1485
  
14cbcfd9   “wangming”   feat: 添加人次记录表和品项分类字段
1486
1487
1488
                  //清空子表数据
                  await _db.Deleteable<LqPersonTimesRecordEntity>().Where(u => u.BusinessId == id).ExecuteCommandAsync();
  
96009bc9   hexiaodong   hxd
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
                  //关闭事务
                  _db.CommitTran();
              }
              catch (Exception)
              {
                  //回滚事务
                  _db.RollbackTran();
                  throw NCCException.Oh(ErrorCode.COM1002);
              }
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
1499
          #endregion
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1500
  
257347ad   “wangming”   feat: enhance fil...
1501
1502
1503
1504
1505
1506
1507
1508
1509
          #region 修改加班系数
          /// <summary>
          /// 修改消耗单的加班系数
          /// </summary>
          /// <remarks>
          /// 只修改加班系数,自动重新计算所有相关的加班字段
          /// 
          /// 计算逻辑:
          /// 1. 主表(lq_xh_hyhk):
4b74fde5   “wangming”   Refactor overtime...
1510
          ///    - 加班手工费 = 健康师原始手工费之和 × 新加班系数(科技部不参与加班)
257347ad   “wangming”   feat: enhance fil...
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
          ///    - 最终手工费 = 原始手工费 + 加班手工费
          /// 
          /// 2. 品项明细表(lq_xh_pxmx):
          ///    - 加班项目次数 = 原始项目次数 × 新加班系数
          ///    - 最终项目次数 = 原始项目次数 + 加班项目次数
          /// 
          /// 3. 健康师业绩表(lq_xh_jksyj):
          ///    - 加班耗卡品项次数 = 原始耗卡品项次数 × 新加班系数
          ///    - 最终耗卡品项次数 = 原始耗卡品项次数 + 加班耗卡品项次数 + 陪同项目次数
          ///    - 加班手工费 = 原始手工费 × 新加班系数
          ///    - 最终手工费 = 原始手工费 + 加班手工费
          /// 
          /// 示例请求:
          /// ```json
          /// {
          ///   "overtimeCoefficient": 0.5
          /// }
          /// ```
          /// </remarks>
          /// <param name="id">耗卡编号</param>
          /// <param name="input">参数</param>
          /// <returns>无返回值</returns>
          /// <response code="200">修改成功</response>
          /// <response code="400">参数错误或数据验证失败</response>
          /// <response code="500">服务器内部错误</response>
          [HttpPut("{id}/overtime-coefficient")]
          public async Task UpdateOvertimeCoefficient(string id, [FromBody] LqXhHyhkUpdateOvertimeInput input)
          {
              try
              {
                  // 开启事务
                  _db.BeginTran();
  
                  // 1. 查询主表记录
                  var entity = await _db.Queryable<LqXhHyhkEntity>()
                      .Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode())
                      .FirstAsync();
  
                  if (entity == null)
                  {
                      throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
                  }
  
                  // 验证原始手工费是否存在
                  if (entity.OriginalSgfy == null || entity.OriginalSgfy == 0)
                  {
                      // 如果原始手工费为空,使用当前的手工费作为原始值
                      if (entity.Sgfy != null && entity.Sgfy > 0)
                      {
                          entity.OriginalSgfy = entity.Sgfy;
                      }
                      else
                      {
                          throw NCCException.Oh("原始手工费不存在,无法修改加班系数");
                      }
                  }
  
4b74fde5   “wangming”   Refactor overtime...
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
                  // 2. 查询健康师业绩,计算主表加班手工费(科技部不参与加班)
                  var jksyjList = await _db.Queryable<LqXhJksyjEntity>()
                      .Where(x => x.Glkdbh == id && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .ToListAsync();
                  var jksOriginalLaborCostSum = jksyjList.Sum(j =>
                  {
                      var original = j.OriginalLaborCost ?? 0;
                      if (original == 0 && (j.LaborCost ?? 0) > 0)
                      {
                          original = (j.LaborCost ?? 0) - (j.OvertimeLaborCost ?? 0);
                          if (original < 0) original = 0;
                      }
                      return original;
                  });
  
                  // 3. 更新主表加班系数和相关字段
257347ad   “wangming”   feat: enhance fil...
1584
1585
1586
                  var newCoefficient = input.overtimeCoefficient ?? 0;
                  var originalSgfy = entity.OriginalSgfy ?? 0;
                  entity.OvertimeCoefficient = newCoefficient;
4b74fde5   “wangming”   Refactor overtime...
1587
                  entity.OvertimeSgfy = (decimal)(jksOriginalLaborCostSum * newCoefficient);
257347ad   “wangming”   feat: enhance fil...
1588
1589
1590
1591
1592
1593
1594
                  entity.Sgfy = originalSgfy + (entity.OvertimeSgfy ?? 0);
                  entity.UpdateTime = DateTime.Now;
  
                  await _db.Updateable(entity)
                      .UpdateColumns(x => new { x.OvertimeCoefficient, x.OvertimeSgfy, x.Sgfy, x.UpdateTime })
                      .ExecuteCommandAsync();
  
4b74fde5   “wangming”   Refactor overtime...
1595
                  // 4. 查询所有品项明细,更新加班字段
257347ad   “wangming”   feat: enhance fil...
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
                  var pxmxList = await _db.Queryable<LqXhPxmxEntity>()
                      .Where(x => x.ConsumeInfoId == id && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .ToListAsync();
  
                  foreach (var pxmx in pxmxList)
                  {
                      // 如果原始项目次数为空,使用当前项目次数作为原始值
                      if (pxmx.OriginalProjectNumber == null || pxmx.OriginalProjectNumber == 0)
                      {
                          if (pxmx.ProjectNumber != null && pxmx.ProjectNumber > 0)
                          {
                              pxmx.OriginalProjectNumber = pxmx.ProjectNumber;
                          }
                          else
                          {
                              pxmx.OriginalProjectNumber = 0;
                          }
                      }
  
                      var originalProjectNumber = pxmx.OriginalProjectNumber ?? 0;
                      pxmx.OvertimeProjectNumber = (decimal)(originalProjectNumber * newCoefficient);
                      pxmx.ProjectNumber = originalProjectNumber + (pxmx.OvertimeProjectNumber ?? 0);
  
                      await _db.Updateable(pxmx)
                          .UpdateColumns(x => new { x.OvertimeProjectNumber, x.ProjectNumber })
                          .ExecuteCommandAsync();
                  }
  
4b74fde5   “wangming”   Refactor overtime...
1624
                  // 5. 更新健康师业绩加班字段(jksyjList 已在步骤2查询)
257347ad   “wangming”   feat: enhance fil...
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
                  foreach (var jksyj in jksyjList)
                  {
                      // 如果原始耗卡品项次数为空,使用当前值作为原始值
                      if (jksyj.OriginalKdpxNumber == null || jksyj.OriginalKdpxNumber == 0)
                      {
                          // 从最终值中减去陪同项目次数和加班值,得到原始值
                          var currentKdpxNumber = jksyj.KdpxNumber ?? 0;
                          var accompaniedNumber = jksyj.AccompaniedProjectNumber ?? 0;
                          var currentOvertime = jksyj.OvertimeKdpxNumber ?? 0;
                          jksyj.OriginalKdpxNumber = currentKdpxNumber - accompaniedNumber - currentOvertime;
                          if (jksyj.OriginalKdpxNumber < 0)
                          {
                              jksyj.OriginalKdpxNumber = 0;
                          }
                      }
  
                      // 如果原始手工费为空,使用当前值作为原始值
                      if (jksyj.OriginalLaborCost == null || jksyj.OriginalLaborCost == 0)
                      {
                          var currentLaborCost = jksyj.LaborCost ?? 0;
                          var currentOvertimeLaborCost = jksyj.OvertimeLaborCost ?? 0;
                          jksyj.OriginalLaborCost = currentLaborCost - currentOvertimeLaborCost;
                          if (jksyj.OriginalLaborCost < 0)
                          {
                              jksyj.OriginalLaborCost = 0;
                          }
                      }
  
                      // 重新计算加班字段
                      var originalKdpxNumber = jksyj.OriginalKdpxNumber ?? 0;
                      var originalLaborCost = jksyj.OriginalLaborCost ?? 0;
                      jksyj.OvertimeKdpxNumber = (decimal)(originalKdpxNumber * newCoefficient);
                      var accompaniedNumberForCalc = jksyj.AccompaniedProjectNumber ?? 0;
                      jksyj.KdpxNumber = originalKdpxNumber + (jksyj.OvertimeKdpxNumber ?? 0) + accompaniedNumberForCalc;
                      jksyj.OvertimeLaborCost = (decimal)(originalLaborCost * newCoefficient);
                      jksyj.LaborCost = originalLaborCost + (jksyj.OvertimeLaborCost ?? 0);
  
                      await _db.Updateable(jksyj)
                          .UpdateColumns(x => new { x.OvertimeKdpxNumber, x.KdpxNumber, x.OvertimeLaborCost, x.LaborCost })
                          .ExecuteCommandAsync();
                  }
  
4b74fde5   “wangming”   Refactor overtime...
1667
                  // 6. 科技部老师业绩表:当前代码中不参与加班计算,保持原值不变
257347ad   “wangming”   feat: enhance fil...
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
                  // 如果需要支持,可以取消注释以下代码
                  /*
                  var kjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>()
                      .Where(x => x.Glkdbh == id && x.IsEffective == StatusEnum.有效.GetHashCode())
                      .ToListAsync();
  
                  foreach (var kjbsyj in kjbsyjList)
                  {
                      if (kjbsyj.OriginalHdpxNumber == null || kjbsyj.OriginalHdpxNumber == 0)
                      {
                          var currentHdpxNumber = kjbsyj.HdpxNumber ?? 0;
                          var currentOvertime = kjbsyj.OvertimeHdpxNumber ?? 0;
                          kjbsyj.OriginalHdpxNumber = currentHdpxNumber - currentOvertime;
                          if (kjbsyj.OriginalHdpxNumber < 0)
                          {
                              kjbsyj.OriginalHdpxNumber = 0;
                          }
                      }
  
                      if (kjbsyj.OriginalLaborCost == null || kjbsyj.OriginalLaborCost == 0)
                      {
                          var currentLaborCost = kjbsyj.LaborCost ?? 0;
                          var currentOvertimeLaborCost = kjbsyj.OvertimeLaborCost ?? 0;
                          kjbsyj.OriginalLaborCost = currentLaborCost - currentOvertimeLaborCost;
                          if (kjbsyj.OriginalLaborCost < 0)
                          {
                              kjbsyj.OriginalLaborCost = 0;
                          }
                      }
  
                      kjbsyj.OvertimeHdpxNumber = (decimal)(kjbsyj.OriginalHdpxNumber * newCoefficient);
                      kjbsyj.HdpxNumber = kjbsyj.OriginalHdpxNumber + kjbsyj.OvertimeHdpxNumber;
                      kjbsyj.OvertimeLaborCost = (decimal)(kjbsyj.OriginalLaborCost * newCoefficient);
                      kjbsyj.LaborCost = kjbsyj.OriginalLaborCost + kjbsyj.OvertimeLaborCost;
  
                      await _db.Updateable(kjbsyj)
                          .UpdateColumns(x => new { x.OvertimeHdpxNumber, x.HdpxNumber, x.OvertimeLaborCost, x.LaborCost })
                          .ExecuteCommandAsync();
                  }
                  */
  
                  // 提交事务
                  _db.CommitTran();
              }
              catch (Exception ex)
              {
                  // 回滚事务
                  _db.RollbackTran();
                  throw;
              }
          }
          #endregion
  
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
          #region 查询健康师消耗业绩列表
          /// <summary>
          /// 查询健康师业绩列表
          /// </summary>
          /// <param name="input">查询参数</param>
          /// <returns>分页的健康师业绩列表</returns>
          /// <remarks>
          /// 查询健康师业绩记录,支持分页和时间筛选
          /// 
          /// 示例请求:
          /// ```json
          /// {
          ///   "glkdbh": "123456789",
          ///   "jksId": "健康师ID",
          ///   "startTime": "2025-01-01T00:00:00",
          ///   "endTime": "2025-01-31T23:59:59",
          ///   "currentPage": 1,
          ///   "pageSize": 10,
          ///   "sidx": "yjsj",
          ///   "sort": "desc"
          /// }
          /// ```
          /// 
          /// 参数说明:
          /// - glkdbh: 开单记录ID(可选)
          /// - jksId: 健康师ID(可选)
          /// - startTime: 查询开始时间(可选)
          /// - endTime: 查询结束时间(可选)
          /// - currentPage: 当前页码
          /// - pageSize: 每页大小
          /// </remarks>
          /// <response code="200">成功获取健康师业绩列表</response>
          /// <response code="400">请求参数错误</response>
          /// <response code="500">服务器内部错误</response>
          [HttpGet("GetJksyjList")]
          public async Task<dynamic> GetJksyjList([FromQuery] LqXhJksyjQueryInput input)
          {
              try
              {
                  var sidx = string.IsNullOrEmpty(input.sidx) ? "yjsj" : input.sidx;
                  var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort;
                  var data = await _db.Queryable<LqXhJksyjEntity>()
                      .WhereIF(!string.IsNullOrEmpty(input.Glkdbh), w => w.Glkdbh == input.Glkdbh)
                      .WhereIF(!string.IsNullOrEmpty(input.JksId), w => w.Jks == input.JksId)
                      .WhereIF(input.StartTime.HasValue, w => w.Yjsj >= input.StartTime.Value)
                      .WhereIF(input.EndTime.HasValue, w => w.Yjsj <= input.EndTime.Value)
                      .Where(w => w.IsEffective == StatusEnum.有效.GetHashCode())
                      .Select(it => new LqXhJksyjInfoOutput
                      {
                          id = it.Id,
                          glkdbh = it.Glkdbh,
                          jks = it.Jks,
                          jksxm = it.Jksxm,
                          jkszh = it.Jkszh,
                          jksyj = it.Jksyj.ToString(),
                          yjsj = it.Yjsj,
                          jsjId = it.JsjId,
                          kdpxid = it.Kdpxid,
                          laborCost = it.LaborCost,
                          kdpxNumber = it.KdpxNumber,
                          storeName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Mdmc),
                          memberId = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hy),
                          memberName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hymc),
                      })
                      .MergeTable()
                      .OrderBy(sidx + " " + sort)
                      .ToPagedListAsync(input.currentPage, input.pageSize);
  
                  return PageResult<LqXhJksyjInfoOutput>.SqlSugarPageResult(data);
              }
              catch (Exception ex)
              {
                  throw NCCException.Oh($"获取健康师业绩列表失败: {ex.Message}");
              }
          }
          #endregion
  
          #region 耗卡记录作废
          /// <summary>
          /// 耗卡记录作废
          /// </summary>
          /// <param name="id">耗卡记录ID</param>
ce74473f   “wangming”   feat: 新增门店类别枚举和耗卡...
1803
          /// <param name="remarks">作废备注</param>
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1804
1805
          /// <returns></returns>
          [HttpPut("CancelCardUsageRecord/{id}")]
ce74473f   “wangming”   feat: 新增门店类别枚举和耗卡...
1806
          public async Task<dynamic> CancelCardUsageRecord(string id, [FromQuery] string remarks = null)
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1807
1808
1809
          {
              try
              {
b5df6609   “wangming”   ```
1810
1811
1812
                  var LqhyhkInfo = await _db.Queryable<LqXhHyhkEntity>()
                      .Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode())
                      .FirstAsync();
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1813
1814
1815
1816
                  if (LqhyhkInfo == null)
                  {
                      throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
                  }
b5df6609   “wangming”   ```
1817
1818
1819
1820
1821
1822
  
                  await ConsumeEditableDaysHelper.EnsureConsumeWithinEditableWindowAsync(_db, LqhyhkInfo);
  
                  //开启事务
                  _db.BeginTran();
                  await InvalidateConsumeCardCascadeAsync(LqhyhkInfo, remarks);
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1823
1824
1825
1826
1827
1828
                  //关闭事务
                  _db.CommitTran();
                  return LqhyhkInfo;
              }
              catch (Exception)
              {
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1829
                  _db.RollbackTran();
b5df6609   “wangming”   ```
1830
                  throw;
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
              }
          }
          #endregion
  
          #region 获取某个会员的耗卡记录
          /// <summary>
          /// 获取某个会员的耗卡记录(分页)
          /// </summary>
          /// <param name="input">查询参数</param>
          /// <returns></returns>
          [HttpGet("GetMemberCardUsageRecord")]
          public async Task<dynamic> GetMemberCardUsageRecord([FromQuery] LqXhHyhkMemberCardUsageQueryInput input)
          {
              try
              {
                  // 参数验证
                  if (string.IsNullOrEmpty(input.MemberId))
                  {
                      throw NCCException.Oh("会员ID不能为空");
                  }
                  // 分页查询会员耗卡记录
                  var data = await _db.Queryable<LqXhHyhkEntity>()
                      .Where(p => p.Hy == input.MemberId && p.IsEffective == StatusEnum.有效.GetHashCode())
                      .WhereIF(!string.IsNullOrEmpty(input.StoreId), p => p.Md == input.StoreId)
                      .WhereIF(input.StartTime.HasValue, p => p.Hksj >= input.StartTime.Value)
                      .WhereIF(input.EndTime.HasValue, p => p.Hksj <= input.EndTime.Value)
                      .Select(it => new LqXhHyhkMemberCardUsageOutput
                      {
                          Id = it.Id,
                          MemberId = it.Hy,
ce74473f   “wangming”   feat: 新增门店类别枚举和耗卡...
1861
                          MemberName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
2164125c   “wangming”   feat: 删除LqXhmxb相关...
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
                          StoreId = it.Md,
                          StoreName = it.Mdmc,
                          UsageDate = it.Hksj,
                          TotalAmount = it.Xfje,
                          Remarks = it.SignatureFile,
                          CreateTime = it.CreateTime
                      })
                      .MergeTable()
                      .OrderBy((input.sidx == null ? "UsageDate" : input.sidx) + " " + (input.sort ?? "desc"))
                      .ToPagedListAsync(input.currentPage, input.pageSize);
  
                  // 获取当前页耗卡记录ID,直接查询对应的品项明细
                  if (data.list.Any())
                  {
                      var recordIds = data.list.Select(r => r.Id).ToList();
                      // 批量查询当前页记录的所有品项明细
                      var itemDetails = await _db.Queryable<LqXhPxmxEntity>().Where(w => recordIds.Contains(w.ConsumeInfoId) && w.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
                      // 按耗卡记录ID分组明细
                      var detailsGrouped = itemDetails.GroupBy(d => d.ConsumeInfoId).ToDictionary(g => g.Key, g => g.ToList());
                      // 为每个记录添加品项明细
                      foreach (var record in data.list)
                      {
                          if (detailsGrouped.ContainsKey(record.Id))
                          {
                              record.ItemDetails = detailsGrouped[record.Id].Select(detail => new LqXhHyhkMemberCardUsageItemDetail
                              {
                                  Id = detail.Id,
                                  ItemId = detail.Px,
                                  ItemName = detail.Pxmc,
                                  UnitPrice = detail.Pxjg,
                                  ProjectNumber = detail.ProjectNumber,
                                  TotalPrice = detail.TotalPrice,
                                  SourceType = detail.SourceType,
                                  CreateTime = detail.CreateTIme
                              }).ToList();
                          }
                      }
                  }
                  return PageResult<LqXhHyhkMemberCardUsageOutput>.SqlSugarPageResult(data);
              }
              catch (Exception ex)
              {
                  throw NCCException.Oh($"获取会员耗卡记录失败: {ex.Message}");
              }
          }
          #endregion
  
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
          #region 同步耗卡数据到人次记录表(同步的时候才用)
          /// <summary>
          /// 同步耗卡数据到人次记录表(同步的时候才用)
          /// </summary>
          /// <remarks>
          /// 将耗卡记录中的健康师和科技老师业绩数据同步到人次记录表(lq_person_times_record
          /// 
          /// 同步逻辑:
          /// 1. 查询所有有效的耗卡记录
          /// 2. 对于每条耗卡记录,查询关联的健康师业绩和科技老师业绩
          /// 3. 对健康师和科技老师进行去重(按人员ID
          /// 4. 为每个去重后的健康师和科技老师创建人次记录
          /// 5. 计算人次数量:1 / 健康师(或科技老师)数量
          /// 
          /// 字段映射:
          /// - F_BusinessId: 耗卡IDlq_xh_hyhk.F_Id
          /// - F_BusinessType: "耗卡"
          /// - F_PersonType: "健康师"  "科技老师"
          /// - F_PersonId: 健康师IDlq_xh_jksyj.jks)或科技老师IDlq_xh_kjbsyj.kjbls
          /// - F_PersonName: 健康师姓名(lq_xh_jksyj.jksxm)或科技老师姓名(lq_xh_kjbsyj.kjblsxm
          /// - F_MemberId: 客户IDlq_xh_hyhk.hy
          /// - F_MemberName: 客户姓名(lq_xh_hyhk.hymc
          /// - F_WorkDate: 耗卡时间的日期部分(lq_xh_hyhk.hksj
          /// - F_WorkMonth: 耗卡时间的月份部分,格式:YYYYMMlq_xh_hyhk.hksj
          /// - F_Quantity: 人次数量 = 1 / 健康师(或科技老师)数量
          /// 
          /// 注意事项:
          /// - 只同步有效的耗卡记录(F_IsEffective = 1
          /// - 只同步有效的健康师业绩和科技老师业绩(F_IsEffective = 1
          /// - 如果已存在相同业务ID的记录,会先删除再重新插入
          /// </remarks>
          /// <param name="consumeId">可选,指定耗卡ID,如果为空则同步所有耗卡数据</param>
          /// <returns>同步结果,包含同步的记录数</returns>
          /// <response code="200">同步成功</response>
          /// <response code="500">服务器内部错误</response>
          [HttpPost("sync-person-times-record")]
          public async Task<dynamic> SyncPersonTimesRecord([FromQuery] string consumeId = null)
          {
              try
              {
                  _logger.LogInformation($"开始同步耗卡数据到人次记录表,耗卡ID: {consumeId ?? "全部"}");
                  // 1. 查询耗卡记录
                  var consumeQuery = _db.Queryable<LqXhHyhkEntity>().Where(x => x.IsEffective == StatusEnum.有效.GetHashCode());
                  if (!string.IsNullOrEmpty(consumeId))
                  {
                      consumeQuery = consumeQuery.Where(x => x.Id == consumeId);
                  }
                  var consumeList = await consumeQuery.ToListAsync();
                  if (!consumeList.Any())
                  {
                      return new { success = true, message = "没有需要同步的耗卡记录", count = 0 };
                  }
                  _logger.LogInformation($"找到 {consumeList.Count} 条耗卡记录需要同步");
                  // 2. 批量查询关联数据
                  var consumeIds = consumeList.Select(x => x.Id).ToList();
                  // 查询健康师业绩
                  var jksyjList = await _db.Queryable<LqXhJksyjEntity>().Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
  
                  // 查询科技老师业绩
                  var kjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>().Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
  
                  // 查询已存在的人次记录(按BusinessId去重,避免重复添加)
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
                  var existingBusinessIds = await _db.Queryable<LqPersonTimesRecordEntity>().Where(x => consumeIds.Contains(x.BusinessId) && x.BusinessType == "耗卡" && x.IsEffective == StatusEnum.有效.GetHashCode()).Select(x => x.BusinessId).Distinct().ToListAsync();
  
                  // 批量查询所有会员是否有开单记录(优化:避免在循环中执行N次查询)
                  var memberIds = consumeList.Where(x => !string.IsNullOrEmpty(x.Hy)).Select(x => x.Hy).Distinct().ToList();
                  var membersWithBilling = new HashSet<string>();
                  if (memberIds.Any())
                  {
                      var billingMemberIds = await _db.Queryable<LqKdKdjlbEntity>()
                          .Where(x => memberIds.Contains(x.Kdhy) && x.IsEffective == StatusEnum.有效.GetHashCode() && x.Sfyj > 0)
                          .Select(x => x.Kdhy)
                          .Distinct()
                          .ToListAsync();
                      membersWithBilling = new HashSet<string>(billingMemberIds);
                  }
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
  
                  // 3. 构建人次记录列表
                  var personTimesRecords = new List<LqPersonTimesRecordEntity>();
  
                  foreach (var consume in consumeList)
                  {
                      // 如果该耗卡记录已存在,跳过
                      if (existingBusinessIds.Contains(consume.Id))
                      {
                          _logger.LogInformation($"耗卡记录 {consume.Id} 已存在人次记录,跳过");
                          continue;
                      }
  
                      if (consume.Hksj == null)
                      {
                          _logger.LogWarning($"耗卡记录 {consume.Id} 的耗卡时间为空,跳过");
                          continue;
                      }
                      var workDate = consume.Hksj.Value.Date; // 工作日期(用于人次统计)
                      var workMonth = consume.Hksj.Value.ToString("yyyyMM"); // 工作月份(用于人头统计)
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2005
2006
                      //查看该会员是否在开单记录表中存在开单记录(从批量查询结果中查找)
                      var billingRecord = !string.IsNullOrEmpty(consume.Hy) && membersWithBilling.Contains(consume.Hy);
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2007
                      // 处理健康师业绩:去重后计算人次数量(剔除T区健康师)
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2008
                      var consumeJksyjList = jksyjList.Where(x => x.Glkdbh == consume.Id && !string.IsNullOrEmpty(x.Jks) && !string.IsNullOrEmpty(x.Jksxm) && (x.Jksxm == null || !x.Jksxm.Contains("T区"))).ToList();
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2009
2010
2011
                      if (consumeJksyjList.Any())
                      {
                          // 按健康师ID去重
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2012
                          var distinctJksyjList = consumeJksyjList.GroupBy(x => x.Jks).Select(g => g.First()).ToList();
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
  
                          // 计算人次数量:1 / 健康师数量
                          var jksQuantity = distinctJksyjList.Count > 0 ? 1.0m / distinctJksyjList.Count : 0;
  
                          foreach (var jksyj in distinctJksyjList)
                          {
                              personTimesRecords.Add(new LqPersonTimesRecordEntity
                              {
                                  Id = YitIdHelper.NextId().ToString(),
                                  BusinessId = consume.Id,
                                  BusinessType = "耗卡",
                                  PersonType = "健康师",
                                  PersonId = jksyj.Jks,
                                  PersonName = jksyj.Jksxm,
                                  MemberId = consume.Hy,
                                  MemberName = consume.Hymc,
                                  WorkDate = workDate,
                                  WorkMonth = workMonth,
                                  Quantity = jksQuantity,
                                  CreateTime = DateTime.Now,
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2033
2034
                                  IsEffective = StatusEnum.有效.GetHashCode(),
                                  HasBilling = billingRecord ? 1 : 0
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2035
2036
2037
2038
2039
                              });
                          }
                      }
  
                      // 处理科技老师业绩:去重后计算人次数量(剔除T区科技老师)
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2040
                      var consumeKjbsyjList = kjbsyjList.Where(x => x.Glkdbh == consume.Id && !string.IsNullOrEmpty(x.Kjbls) && !string.IsNullOrEmpty(x.Kjblsxm) && (x.Kjblsxm == null || !x.Kjblsxm.Contains("T区"))).ToList();
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2041
2042
2043
                      if (consumeKjbsyjList.Any())
                      {
                          // 按科技老师ID去重
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2044
                          var distinctKjbsyjList = consumeKjbsyjList.GroupBy(x => x.Kjbls).Select(g => g.First()).ToList();
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
  
                          // 计算人次数量:1 / 科技老师数量
                          var kjbsQuantity = distinctKjbsyjList.Count > 0 ? 1.0m / distinctKjbsyjList.Count : 0;
  
                          foreach (var kjbsyj in distinctKjbsyjList)
                          {
                              personTimesRecords.Add(new LqPersonTimesRecordEntity
                              {
                                  Id = YitIdHelper.NextId().ToString(),
                                  BusinessId = consume.Id,
                                  BusinessType = "耗卡",
                                  PersonType = "科技老师",
                                  PersonId = kjbsyj.Kjbls,
                                  PersonName = kjbsyj.Kjblsxm,
                                  MemberId = consume.Hy,
                                  MemberName = consume.Hymc,
                                  WorkDate = workDate,
                                  WorkMonth = workMonth,
                                  Quantity = kjbsQuantity,
                                  CreateTime = DateTime.Now,
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2065
2066
                                  IsEffective = StatusEnum.有效.GetHashCode(),
                                  HasBilling = billingRecord ? 1 : 0
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
                              });
                          }
                      }
                  }
  
                  // 4. 使用事务保存数据
                  var result = await _db.Ado.UseTranAsync(async () =>
                  {
                      // 如果指定了耗卡ID,删除该耗卡的旧记录(用于重新同步)
                      // 如果没有指定耗卡ID,不删除任何记录(因为已经在构建记录列表时跳过了已存在的记录)
                      if (!string.IsNullOrEmpty(consumeId))
                      {
9ec80591   “wangming”   优化库存使用批量创建接口:库存不足...
2079
                          await _db.Deleteable<LqPersonTimesRecordEntity>().Where(x => x.BusinessId == consumeId && x.BusinessType == "耗卡").ExecuteCommandAsync();
273e501a   “wangming”   修复产品上下架功能;修复门店每日统...
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
                      }
  
                      // 批量插入新记录
                      if (personTimesRecords.Any())
                      {
                          // 分批插入,每批1000
                          var batchSize = 1000;
                          for (int i = 0; i < personTimesRecords.Count; i += batchSize)
                          {
                              var batch = personTimesRecords.Skip(i).Take(batchSize).ToList();
                              await _db.Insertable(batch).ExecuteCommandAsync();
                          }
                      }
  
                      return personTimesRecords.Count;
                  });
  
                  if (result.IsSuccess)
                  {
                      _logger.LogInformation($"同步完成,共同步 {result.Data} 条人次记录");
                      return new { success = true, message = "同步成功", count = result.Data };
                  }
                  else
                  {
                      _logger.LogError($"同步失败: {result.ErrorMessage}");
                      throw NCCException.Oh(ErrorCode.COM1000, $"同步失败: {result.ErrorMessage}");
                  }
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, $"同步耗卡数据到人次记录表失败: {ex.ToString()}");
                  throw NCCException.Oh(ErrorCode.COM1005, $"同步耗卡数据到人次记录表失败: {ex.Message}");
              }
          }
          #endregion
  
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
          #region 耗卡品项明细列表
          /// <summary>
          /// 获取耗卡品项明细记录列表
          /// </summary>
          /// <remarks>
          /// 根据多种条件查询耗卡品项明细记录列表,支持分页、排序、筛选等功能
          /// 
          /// 示例请求:
          /// GET /api/Extend/LqXhHyhk/consume-item-detail-list?currentPage=1&amp;pageSize=10&amp;startTime=2025-01-01&amp;endTime=2025-01-31
          /// 
          /// 传入参数说明:
          /// - currentPage: 当前页码(必填,默认1
          /// - pageSize: 每页数量(必填,默认10
          /// - sidx: 排序字段(可选,默认"yjsj"
          /// - sort: 排序方式(可选,ASC/DESC,默认DESC
          /// - Id: 品项明细ID(可选,精确匹配)
          /// - ConsumeId: 耗卡记录ID(可选,精确匹配)
          /// - StartConsumeTime/EndConsumeTime: 耗卡时间范围(可选,格式:yyyy-MM-dd
          /// - startTime/endTime: 耗卡时间范围(兼容参数名,格式:yyyy-MM-dd
          /// - MemberId: 会员ID(可选,精确匹配)
          /// - MemberName: 会员名称(可选,模糊查询)
          /// - MemberPhone: 会员手机号(可选,精确匹配)
          /// - ItemId: 品项ID(可选,精确匹配)
          /// - ItemName: 品项名称(可选,模糊查询)
          /// - ItemType: 品项类型(可选,精确匹配)
          /// - SourceType: 来源类型(可选,精确匹配)
          /// - StoreId: 门店ID(可选,精确匹配)
          /// 
          /// 返回字段说明:
          /// - id: 品项明细ID
          /// - consumeId: 耗卡记录ID
          /// - consumeTime: 耗卡时间(DateTime格式)
          /// - memberName: 会员名称(关联会员表)
          /// - memberPhone: 会员手机号(关联会员表)
          /// - itemName: 品项名称(品项明细表字段)
          /// - itemType: 品项类型(关联项目资料表的qt2字段)
          /// - itemPrice: 品项价格(decimal类型)
          /// - projectNumber: 项目次数(decimal类型,支持小数)
          /// - originalProjectNumber: 原始项目次数(decimal类型)
          /// - totalPrice: 合计金额(decimal类型)
          /// - sourceType: 来源类型(字符串,如:购买、赠送、体验)
          /// - storeId: 门店ID(关联耗卡记录表的门店ID
          /// - storeName: 门店名称(关联门店表的店名字段)
50867d2a   “wangming”   更新消耗相关服务和DTO
2159
          /// - lqXhJksyjList: 健康师业绩列表(关联健康师业绩表,通过F_kdpxid关联品项明细ID
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
          /// </remarks>
          /// <param name="input">查询参数</param>
          /// <returns>耗卡品项明细记录列表(分页)</returns>
          /// <response code="200">查询成功,返回耗卡品项明细记录列表</response>
          /// <response code="400">参数错误,如页码或页大小无效</response>
          /// <response code="500">服务器错误,查询过程中发生异常</response>
          [HttpGet("consume-item-detail-list")]
          public async Task<dynamic> GetConsumeItemDetailList([FromQuery] ConsumeItemDetailListQueryInput input)
          {
              try
              {
                  var sidx = input.sidx == null ? "yjsj" : input.sidx;
                  var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
  
                  // 处理耗卡时间范围(兼容 StartConsumeTime/EndConsumeTime  startTime/endTime 两种参数名)
                  DateTime? startConsumeTime = null;
                  DateTime? endConsumeTime = null;
  
                  // 优先使用 StartConsumeTime/EndConsumeTime,如果没有则使用 startTime/endTime
                  string startTimeStr = !string.IsNullOrEmpty(input.StartConsumeTime) ? input.StartConsumeTime : input.startTime;
                  string endTimeStr = !string.IsNullOrEmpty(input.EndConsumeTime) ? input.EndConsumeTime : input.endTime;
  
                  if (!string.IsNullOrEmpty(startTimeStr) && !string.IsNullOrEmpty(endTimeStr))
                  {
                      // 尝试解析日期字符串(支持多种格式)
                      if (DateTime.TryParse(startTimeStr, out DateTime startDate))
                      {
                          startConsumeTime = startDate;
                      }
                      else
                      {
                          throw NCCException.Oh($"开始时间格式错误:{startTimeStr}");
                      }
  
                      if (DateTime.TryParse(endTimeStr, out DateTime endDate))
                      {
                          endConsumeTime = endDate;
                      }
                      else
                      {
                          throw NCCException.Oh($"结束时间格式错误:{endTimeStr}");
                      }
                  }
  
                  // 优化查询:先分页查询主表,再批量查询关联数据,避免子查询性能问题
                  // 1. 先构建基础查询条件
                  var baseQuery = _db.Queryable<LqXhPxmxEntity>()
                      .Where(pxmx => pxmx.IsEffective == StatusEnum.有效.GetHashCode())
                      .WhereIF(!string.IsNullOrEmpty(input.Id), pxmx => pxmx.Id == input.Id)
                      .WhereIF(!string.IsNullOrEmpty(input.ConsumeId), pxmx => pxmx.ConsumeInfoId == input.ConsumeId)
                      .WhereIF(startConsumeTime.HasValue, pxmx => pxmx.Yjsj >= new DateTime(startConsumeTime.Value.Year, startConsumeTime.Value.Month, startConsumeTime.Value.Day, 0, 0, 0))
                      .WhereIF(endConsumeTime.HasValue, pxmx => pxmx.Yjsj <= new DateTime(endConsumeTime.Value.Year, endConsumeTime.Value.Month, endConsumeTime.Value.Day, 23, 59, 59))
                      .WhereIF(!string.IsNullOrEmpty(input.MemberId), pxmx => pxmx.MemberId == input.MemberId)
                      .WhereIF(!string.IsNullOrEmpty(input.ItemId), pxmx => pxmx.Px == input.ItemId)
                      .WhereIF(!string.IsNullOrEmpty(input.ItemName), pxmx => pxmx.Pxmc != null && pxmx.Pxmc.Contains(input.ItemName))
                      .WhereIF(!string.IsNullOrEmpty(input.SourceType), pxmx => pxmx.SourceType == input.SourceType)
                      .WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => pxmx.ItemCategory == input.ItemType);
  
                  // 2. 通过 EXISTS 子查询筛选关联字段(在分页前筛选,确保分页准确)
75c8f709   “wangming”   feat: 1. 拓客明细页面是否...
2219
2220
                  // 处理多门店筛选:优先使用StoreIds,如果没有则使用StoreId
                  var filterStoreIds = new List<string>();
2035feb5   “wangming”   fix: 修复GET请求中List...
2221
                  if (!string.IsNullOrEmpty(input.StoreIds))
75c8f709   “wangming”   feat: 1. 拓客明细页面是否...
2222
                  {
2035feb5   “wangming”   fix: 修复GET请求中List...
2223
2224
2225
2226
2227
                      // 解析逗号分隔的门店ID字符串
                      filterStoreIds = input.StoreIds.Split(',')
                          .Where(x => !string.IsNullOrWhiteSpace(x))
                          .Select(x => x.Trim())
                          .ToList();
75c8f709   “wangming”   feat: 1. 拓客明细页面是否...
2228
2229
2230
2231
2232
2233
                  }
                  else if (!string.IsNullOrEmpty(input.StoreId))
                  {
                      filterStoreIds = new List<string> { input.StoreId };
                  }
  
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
2234
2235
                  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())
75c8f709   “wangming”   feat: 1. 拓客明细页面是否...
2236
                      .WhereIF(filterStoreIds.Any(), pxmx => SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(x => x.Id == pxmx.ConsumeInfoId && filterStoreIds.Contains(x.Md)).Any());
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
  
                  // 3. 先分页查询主表数据(查询实体类,提高性能)
                  var pagedData = await baseQuery.OrderBy(sidx + " " + sort).ToPagedListAsync(input.currentPage, input.pageSize);
  
                  // 4. 批量查询关联数据
                  var itemIds = pagedData.list.Select(x => x.Id).ToList();
                  var memberIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.MemberId)).Select(x => x.MemberId).Distinct().ToList();
                  var consumeIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.ConsumeInfoId)).Select(x => x.ConsumeInfoId).Distinct().ToList();
  
                  // 批量查询会员信息
                  var memberDict = new Dictionary<string, (string Name, string Phone)>();
                  if (memberIds.Any())
                  {
                      var members = await _db.Queryable<LqKhxxEntity>().Where(x => memberIds.Contains(x.Id)).Select(x => new { x.Id, x.Khmc, x.Sjh }).ToListAsync();
                      memberDict = members.ToDictionary(x => x.Id, x => (x.Khmc ?? "", x.Sjh ?? ""));
                  }
  
                  // 批量查询耗卡记录,获取门店ID和耗卡时间
                  var consumeDict = new Dictionary<string, (string StoreId, DateTime? ConsumeTime)>();
                  if (consumeIds.Any())
                  {
                      var consumes = await _db.Queryable<LqXhHyhkEntity>().Where(x => consumeIds.Contains(x.Id)).Select(x => new { x.Id, x.Md, x.Hksj }).ToListAsync();
                      consumeDict = consumes.ToDictionary(x => x.Id, x => (x.Md ?? "", x.Hksj));
                  }
  
                  // 批量查询门店信息
                  var storeDict = new Dictionary<string, string>();
                  var storeIds = consumeDict.Values.Where(x => !string.IsNullOrEmpty(x.StoreId)).Select(x => x.StoreId).Distinct().ToList();
                  if (storeIds.Any())
                  {
                      var stores = await _db.Queryable<LqMdxxEntity>().Where(x => storeIds.Contains(x.Id)).Select(x => new { x.Id, x.Dm }).ToListAsync();
                      storeDict = stores.ToDictionary(x => x.Id, x => x.Dm ?? "");
                  }
  
50867d2a   “wangming”   更新消耗相关服务和DTO
2271
2272
2273
2274
2275
2276
2277
                  // 批量查询健康师业绩信息(通过 F_kdpxid 关联到品项明细ID
                  var jksyjDict = new Dictionary<string, List<LqXhJksyjInfoOutput>>();
                  if (itemIds.Any())
                  {
                      var jksyjEntities = await _db.Queryable<LqXhJksyjEntity>()
                          .Where(x => itemIds.Contains(x.Kdpxid) && x.IsEffective == StatusEnum.有效.GetHashCode())
                          .ToListAsync();
fd65ae16   “wangming”   feat: inventory a...
2278
  
50867d2a   “wangming”   更新消耗相关服务和DTO
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
                      var jksyjList = jksyjEntities.Select(x => new LqXhJksyjInfoOutput
                      {
                          id = x.Id,
                          glkdbh = x.Glkdbh,
                          jks = x.Jks,
                          jksxm = x.Jksxm,
                          jkszh = x.Jkszh,
                          jksyj = x.Jksyj?.ToString() ?? "0",
                          yjsj = x.Yjsj,
                          jsjId = x.JsjId,
                          kdpxid = x.Kdpxid,
                          laborCost = x.LaborCost,
                          kdpxNumber = x.KdpxNumber,
                          originalKdpxNumber = x.OriginalKdpxNumber,
                          overtimeKdpxNumber = x.OvertimeKdpxNumber,
                          originalLaborCost = x.OriginalLaborCost,
                          overtimeLaborCost = x.OvertimeLaborCost,
                          isAccompanied = x.IsAccompanied,
                          accompaniedProjectNumber = x.AccompaniedProjectNumber
                      }).ToList();
fd65ae16   “wangming”   feat: inventory a...
2299
  
50867d2a   “wangming”   更新消耗相关服务和DTO
2300
2301
2302
2303
2304
2305
                      jksyjDict = jksyjList
                          .Where(x => !string.IsNullOrEmpty(x.kdpxid))
                          .GroupBy(x => x.kdpxid)
                          .ToDictionary(g => g.Key, g => g.ToList());
                  }
  
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
2306
                  // 5. 组装返回数据
fd65ae16   “wangming”   feat: inventory a...
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
                  var resultList = pagedData.list.Select(pxmx =>
                  {
                      var jksyjList = jksyjDict.ContainsKey(pxmx.Id) ? jksyjDict[pxmx.Id] : new List<LqXhJksyjInfoOutput>();
                      var firstJksyj = jksyjList.FirstOrDefault();
  
                      return new ConsumeItemDetailListOutput
                      {
                          id = pxmx.Id,
                          consumeId = pxmx.ConsumeInfoId,
                          consumeTime = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) ? consumeDict[pxmx.ConsumeInfoId].ConsumeTime : pxmx.Yjsj,
                          memberName = pxmx.MemberId != null && memberDict.ContainsKey(pxmx.MemberId) ? memberDict[pxmx.MemberId].Name : "",
                          memberPhone = pxmx.MemberId != null && memberDict.ContainsKey(pxmx.MemberId) ? memberDict[pxmx.MemberId].Phone : "",
                          itemName = pxmx.Pxmc,
                          itemType = pxmx.ItemCategory,
                          itemPrice = pxmx.Pxjg,
                          projectNumber = pxmx.ProjectNumber,
                          originalProjectNumber = pxmx.OriginalProjectNumber,
                          totalPrice = pxmx.TotalPrice,
                          sourceType = pxmx.SourceType,
                          storeId = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) ? consumeDict[pxmx.ConsumeInfoId].StoreId : "",
                          storeName = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) && !string.IsNullOrEmpty(consumeDict[pxmx.ConsumeInfoId].StoreId) && storeDict.ContainsKey(consumeDict[pxmx.ConsumeInfoId].StoreId) ? storeDict[consumeDict[pxmx.ConsumeInfoId].StoreId] : "",
                          healthCoachId = firstJksyj?.jks ?? "",
                          healthCoachName = firstJksyj?.jksxm ?? "",
                          healthCoachAccount = firstJksyj?.jkszh ?? "",
                          lqXhJksyjList = jksyjList
                      };
b26a469f   “wangming”   feat: 添加耗卡品项明细查询接...
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
                  }).ToList();
  
                  // 6. 返回分页结果
                  var result = new SqlSugarPagedList<ConsumeItemDetailListOutput>
                  {
                      list = resultList,
                      pagination = pagedData.pagination
                  };
  
                  return PageResult<ConsumeItemDetailListOutput>.SqlSugarPageResult(result);
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, $"获取耗卡品项明细记录列表失败: {ex.ToString()}");
                  throw NCCException.Oh(ErrorCode.COM1005, $"获取耗卡品项明细记录列表失败: {ex.Message}");
              }
          }
          #endregion
  
fd65ae16   “wangming”   feat: inventory a...
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
          #region 耗卡品项明细导出(每个健康师一行)
          /// <summary>
          /// 导出耗卡品项明细记录(每个健康师一行)
          /// </summary>
          /// <remarks>
          /// 导出耗卡品项明细记录,如果一个耗卡品项明细有多个健康师,每个健康师单独一行
          /// 
          /// 示例请求:
          /// GET /api/Extend/LqXhHyhk/consume-item-detail-export?StartConsumeTime=2026-01-01&amp;EndConsumeTime=2026-01-21
          /// </remarks>
          /// <param name="input">查询参数(与consume-item-detail-list相同)</param>
          /// <returns>Excel文件下载链接</returns>
          [HttpGet("consume-item-detail-export")]
          public async Task<dynamic> ExportConsumeItemDetailList([FromQuery] ConsumeItemDetailListQueryInput input)
          {
              try
              {
                  // 获取所有数据(不分页)
                  var sidx = input.sidx == null ? "yjsj" : input.sidx;
                  var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
  
                  // 处理耗卡时间范围(兼容 StartConsumeTime/EndConsumeTime  startTime/endTime 两种参数名)
                  DateTime? startConsumeTime = null;
                  DateTime? endConsumeTime = null;
  
                  string startTimeStr = !string.IsNullOrEmpty(input.StartConsumeTime) ? input.StartConsumeTime : input.startTime;
                  string endTimeStr = !string.IsNullOrEmpty(input.EndConsumeTime) ? input.EndConsumeTime : input.endTime;
  
                  if (!string.IsNullOrEmpty(startTimeStr) && !string.IsNullOrEmpty(endTimeStr))
                  {
                      if (DateTime.TryParse(startTimeStr, out DateTime startDate))
                      {
                          startConsumeTime = startDate;
                      }
                      else
                      {
                          throw NCCException.Oh($"开始时间格式错误:{startTimeStr}");
                      }
  
                      if (DateTime.TryParse(endTimeStr, out DateTime endDate))
                      {
                          endConsumeTime = endDate;
                      }
                      else
                      {
                          throw NCCException.Oh($"结束时间格式错误:{endTimeStr}");
                      }
                  }
  
                  // 构建基础查询条件(与GetConsumeItemDetailList相同)
                  var baseQuery = _db.Queryable<LqXhPxmxEntity>()
                      .Where(pxmx => pxmx.IsEffective == StatusEnum.有效.GetHashCode())
                      .WhereIF(!string.IsNullOrEmpty(input.Id), pxmx => pxmx.Id == input.Id)
                      .WhereIF(!string.IsNullOrEmpty(input.ConsumeId), pxmx => pxmx.ConsumeInfoId == input.ConsumeId)
                      .WhereIF(startConsumeTime.HasValue, pxmx => pxmx.Yjsj >= new DateTime(startConsumeTime.Value.Year, startConsumeTime.Value.Month, startConsumeTime.Value.Day, 0, 0, 0))
                      .WhereIF(endConsumeTime.HasValue, pxmx => pxmx.Yjsj <= new DateTime(endConsumeTime.Value.Year, endConsumeTime.Value.Month, endConsumeTime.Value.Day, 23, 59, 59))
                      .WhereIF(!string.IsNullOrEmpty(input.MemberId), pxmx => pxmx.MemberId == input.MemberId)
                      .WhereIF(!string.IsNullOrEmpty(input.ItemId), pxmx => pxmx.Px == input.ItemId)
                      .WhereIF(!string.IsNullOrEmpty(input.ItemName), pxmx => pxmx.Pxmc != null && pxmx.Pxmc.Contains(input.ItemName))
                      .WhereIF(!string.IsNullOrEmpty(input.SourceType), pxmx => pxmx.SourceType == input.SourceType)
                      .WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => pxmx.ItemCategory == input.ItemType);
  
                  // 处理多门店筛选
                  var filterStoreIds = new List<string>();
                  if (!string.IsNullOrEmpty(input.StoreIds))
                  {
                      filterStoreIds = input.StoreIds.Split(',')
                          .Where(x => !string.IsNullOrWhiteSpace(x))
                          .Select(x => x.Trim())
                          .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(filterStoreIds.Any(), pxmx => SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(x => x.Id == pxmx.ConsumeInfoId && filterStoreIds.Contains(x.Md)).Any());
  
                  // 获取所有数据(不分页)
                  _logger.LogInformation($"导出耗卡品项明细:开始查询,时间范围: {startTimeStr} 到 {endTimeStr}");
                  var allData = await baseQuery.OrderBy(sidx + " " + sort).ToListAsync();
  
                  _logger.LogInformation($"导出耗卡品项明细:查询到 {allData?.Count ?? 0} 条品项明细记录");
  
                  if (allData == null || !allData.Any())
                  {
                      _logger.LogWarning($"导出耗卡品项明细:查询结果为空,查询条件 - StartConsumeTime: {startTimeStr}, EndConsumeTime: {endTimeStr}, StartTime: {input.startTime}, EndTime: {input.endTime}");
                      throw NCCException.Oh(ErrorCode.COM1005, "没有符合条件的数据可导出");
                  }
  
                  // 批量查询关联数据
                  var itemIds = allData.Select(x => x.Id).ToList();
                  var memberIds = allData.Where(x => !string.IsNullOrEmpty(x.MemberId)).Select(x => x.MemberId).Distinct().ToList();
                  var consumeIds = allData.Where(x => !string.IsNullOrEmpty(x.ConsumeInfoId)).Select(x => x.ConsumeInfoId).Distinct().ToList();
  
                  // 批量查询会员信息
                  var memberDict = new Dictionary<string, (string Name, string Phone)>();
                  if (memberIds.Any())
                  {
                      var members = await _db.Queryable<LqKhxxEntity>().Where(x => memberIds.Contains(x.Id)).Select(x => new { x.Id, x.Khmc, x.Sjh }).ToListAsync();
                      memberDict = members.ToDictionary(x => x.Id, x => (x.Khmc ?? "", x.Sjh ?? ""));
                  }
  
                  // 批量查询耗卡记录
                  var consumeDict = new Dictionary<string, (string StoreId, DateTime? ConsumeTime)>();
                  if (consumeIds.Any())
                  {
                      var consumes = await _db.Queryable<LqXhHyhkEntity>().Where(x => consumeIds.Contains(x.Id)).Select(x => new { x.Id, x.Md, x.Hksj }).ToListAsync();
                      consumeDict = consumes.ToDictionary(x => x.Id, x => (x.Md ?? "", x.Hksj));
                  }
  
                  // 批量查询门店信息
                  var storeDict = new Dictionary<string, string>();
                  var storeIds = consumeDict.Values.Where(x => !string.IsNullOrEmpty(x.StoreId)).Select(x => x.StoreId).Distinct().ToList();
                  if (storeIds.Any())
                  {
                      var stores = await _db.Queryable<LqMdxxEntity>().Where(x => storeIds.Contains(x.Id)).Select(x => new { x.Id, x.Dm }).ToListAsync();
                      storeDict = stores.ToDictionary(x => x.Id, x => x.Dm ?? "");
                  }
  
                  // 批量查询健康师业绩信息
                  var jksyjDict = new Dictionary<string, List<LqXhJksyjInfoOutput>>();
                  if (itemIds.Any())
                  {
                      var jksyjEntities = await _db.Queryable<LqXhJksyjEntity>()
                          .Where(x => itemIds.Contains(x.Kdpxid) && x.IsEffective == StatusEnum.有效.GetHashCode())
                          .ToListAsync();
  
                      var jksyjList = jksyjEntities.Select(x => new LqXhJksyjInfoOutput
                      {
                          id = x.Id,
                          glkdbh = x.Glkdbh,
                          jks = x.Jks,
                          jksxm = x.Jksxm,
                          jkszh = x.Jkszh,
                          jksyj = x.Jksyj?.ToString() ?? "0",
                          yjsj = x.Yjsj,
                          jsjId = x.JsjId,
                          kdpxid = x.Kdpxid,
                          laborCost = x.LaborCost,
                          kdpxNumber = x.KdpxNumber,
                          originalKdpxNumber = x.OriginalKdpxNumber,
                          overtimeKdpxNumber = x.OvertimeKdpxNumber,
                          originalLaborCost = x.OriginalLaborCost,
                          overtimeLaborCost = x.OvertimeLaborCost,
                          isAccompanied = x.IsAccompanied,
                          accompaniedProjectNumber = x.AccompaniedProjectNumber
                      }).ToList();
  
                      jksyjDict = jksyjList
                          .Where(x => !string.IsNullOrEmpty(x.kdpxid))
                          .GroupBy(x => x.kdpxid)
                          .ToDictionary(g => g.Key, g => g.ToList());
                  }
  
                  // 展开数据:每个健康师一行
                  var exportData = new List<ConsumeItemDetailExportOutput>();
                  _logger.LogInformation($"开始展开数据,品项明细数量: {allData.Count}, 健康师业绩字典数量: {jksyjDict.Count}");
                  int processedCount = 0;
                  foreach (var pxmx in allData)
                  {
                      var jksyjList = jksyjDict.ContainsKey(pxmx.Id) ? jksyjDict[pxmx.Id] : new List<LqXhJksyjInfoOutput>();
  
                      // 基础信息
                      var baseInfo = new
                      {
                          id = pxmx.Id,
                          consumeId = pxmx.ConsumeInfoId,
                          consumeTime = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) ? consumeDict[pxmx.ConsumeInfoId].ConsumeTime : pxmx.Yjsj,
                          memberName = pxmx.MemberId != null && memberDict.ContainsKey(pxmx.MemberId) ? memberDict[pxmx.MemberId].Name : "",
                          memberPhone = pxmx.MemberId != null && memberDict.ContainsKey(pxmx.MemberId) ? memberDict[pxmx.MemberId].Phone : "",
                          itemName = pxmx.Pxmc,
                          itemType = pxmx.ItemCategory,
                          itemPrice = pxmx.Pxjg,
                          projectNumber = pxmx.ProjectNumber,
                          originalProjectNumber = pxmx.OriginalProjectNumber,
                          totalPrice = pxmx.TotalPrice,
                          sourceType = pxmx.SourceType,
                          storeId = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) ? consumeDict[pxmx.ConsumeInfoId].StoreId : "",
                          storeName = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) && !string.IsNullOrEmpty(consumeDict[pxmx.ConsumeInfoId].StoreId) && storeDict.ContainsKey(consumeDict[pxmx.ConsumeInfoId].StoreId) ? storeDict[consumeDict[pxmx.ConsumeInfoId].StoreId] : ""
                      };
  
                      // 如果没有健康师,也要导出一行(健康师信息为空)
                      if (jksyjList == null || !jksyjList.Any())
                      {
                          exportData.Add(new ConsumeItemDetailExportOutput
                          {
                              id = baseInfo.id,
                              consumeId = baseInfo.consumeId,
                              consumeTime = baseInfo.consumeTime,
                              memberName = baseInfo.memberName,
                              memberPhone = baseInfo.memberPhone,
                              itemName = baseInfo.itemName,
                              itemType = baseInfo.itemType,
                              itemPrice = baseInfo.itemPrice,
                              projectNumber = baseInfo.projectNumber,
                              originalProjectNumber = baseInfo.originalProjectNumber,
                              totalPrice = baseInfo.totalPrice,
                              sourceType = baseInfo.sourceType,
                              storeId = baseInfo.storeId,
                              storeName = baseInfo.storeName,
                              healthCoachId = "",
                              healthCoachName = "",
                              healthCoachAccount = "",
                              healthCoachPerformance = "",
                              laborCost = null,
                              kdpxNumber = null
                          });
                      }
                      else
                      {
                          // 每个健康师一行
                          foreach (var jksyj in jksyjList)
                          {
                              exportData.Add(new ConsumeItemDetailExportOutput
                              {
                                  id = baseInfo.id,
                                  consumeId = baseInfo.consumeId,
                                  consumeTime = baseInfo.consumeTime,
                                  memberName = baseInfo.memberName,
                                  memberPhone = baseInfo.memberPhone,
                                  itemName = baseInfo.itemName,
                                  itemType = baseInfo.itemType,
                                  itemPrice = baseInfo.itemPrice,
                                  projectNumber = baseInfo.projectNumber,
                                  originalProjectNumber = baseInfo.originalProjectNumber,
                                  totalPrice = baseInfo.totalPrice,
                                  sourceType = baseInfo.sourceType,
                                  storeId = baseInfo.storeId,
                                  storeName = baseInfo.storeName,
                                  healthCoachId = jksyj.jks ?? "",
                                  healthCoachName = jksyj.jksxm ?? "",
                                  healthCoachAccount = jksyj.jkszh ?? "",
                                  healthCoachPerformance = jksyj.jksyj ?? "0",
                                  laborCost = jksyj.laborCost,
                                  kdpxNumber = jksyj.kdpxNumber
                              });
                          }
                      }
                      processedCount++;
                      if (processedCount % 1000 == 0)
                      {
                          _logger.LogInformation($"已处理 {processedCount}/{allData.Count} 条品项明细,当前导出数据行数: {exportData.Count}");
                      }
                  }
  
                  _logger.LogInformation($"数据展开完成,处理品项明细数量: {processedCount}, 导出数据行数: {exportData?.Count ?? 0}");
  
                  // 配置Excel导出
                  List<ParamsModel> paramList =
                      "[{\"value\":\"品项明细ID\",\"field\":\"id\"},{\"value\":\"耗卡记录ID\",\"field\":\"consumeId\"},{\"value\":\"耗卡时间\",\"field\":\"consumeTime\"},{\"value\":\"会员名称\",\"field\":\"memberName\"},{\"value\":\"会员手机\",\"field\":\"memberPhone\"},{\"value\":\"品项名称\",\"field\":\"itemName\"},{\"value\":\"品项类型\",\"field\":\"itemType\"},{\"value\":\"品项价格\",\"field\":\"itemPrice\"},{\"value\":\"项目次数\",\"field\":\"projectNumber\"},{\"value\":\"原始项目次数\",\"field\":\"originalProjectNumber\"},{\"value\":\"合计金额\",\"field\":\"totalPrice\"},{\"value\":\"来源类型\",\"field\":\"sourceType\"},{\"value\":\"门店ID\",\"field\":\"storeId\"},{\"value\":\"门店名称\",\"field\":\"storeName\"},{\"value\":\"健康师ID\",\"field\":\"healthCoachId\"},{\"value\":\"健康师姓名\",\"field\":\"healthCoachName\"},{\"value\":\"健康师账号\",\"field\":\"healthCoachAccount\"},{\"value\":\"健康师业绩\",\"field\":\"healthCoachPerformance\"},{\"value\":\"手工费\",\"field\":\"laborCost\"},{\"value\":\"耗卡品项次数\",\"field\":\"kdpxNumber\"}]".ToList<ParamsModel>();
  
                  ExcelConfig excelconfig = new ExcelConfig();
                  excelconfig.FileName = "耗卡品项明细_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
                  excelconfig.HeadFont = "微软雅黑";
                  excelconfig.HeadPoint = 10;
                  excelconfig.IsAllSizeColumn = true;
                  excelconfig.ColumnModel = new List<ExcelColumnModel>();
  
                  // 默认导出所有字段
                  foreach (var param in paramList)
                  {
                      excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = param.field, ExcelColumn = param.value });
                  }
  
                  // 查找项目根目录并创建ExportFiles文件夹
                  var baseDir = AppContext.BaseDirectory;
                  var projectRoot = baseDir;
                  var dir = new DirectoryInfo(baseDir);
                  while (dir != null && dir.Parent != null)
                  {
                      try
                      {
                          if (dir.GetDirectories(".git").Any() || dir.GetFiles("*.sln").Any())
                          {
                              projectRoot = dir.FullName;
                              break;
                          }
                      }
                      catch
                      {
                          // 忽略访问错误,继续向上查找
                      }
                      dir = dir.Parent;
                  }
  
                  // 如果没找到 .git  .sln 目录,再查找包含 .sln 文件的目录
                  if (projectRoot == baseDir)
                  {
                      dir = new DirectoryInfo(baseDir);
                      while (dir != null && dir.Parent != null)
                      {
                          try
                          {
                              if (dir.GetFiles("*.sln").Any())
                              {
                                  projectRoot = dir.FullName;
                                  break;
                              }
                          }
                          catch
                          {
                              // 忽略访问错误,继续向上查找
                          }
                          dir = dir.Parent;
                      }
                  }
  
                  // 在项目根目录下创建 ExportFiles 文件夹
                  var exportFilesPath = Path.Combine(projectRoot, "ExportFiles");
                  if (!Directory.Exists(exportFilesPath))
                  {
                      Directory.CreateDirectory(exportFilesPath);
                  }
  
                  var addPath = Path.Combine(exportFilesPath, excelconfig.FileName);
                  ExcelExportHelper<ConsumeItemDetailExportOutput>.Export(exportData, excelconfig, addPath);
                  var fileName = _userManager.UserId + "|" + addPath + "|xls";
                  var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
                  return output;
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, $"导出耗卡品项明细记录失败: {ex.ToString()}");
                  var errorMessage = $"导出耗卡品项明细记录失败: {ex.Message}";
                  if (ex.InnerException != null)
                  {
                      errorMessage += $" | 内部异常: {ex.InnerException.Message}";
                  }
                  throw NCCException.Oh(ErrorCode.COM1005, errorMessage);
              }
          }
          #endregion
  
9c60e8ba   “wangming”   ```
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
          #region 列表查询性能辅助
  
          private static LqXhHyhkListOutput MapHyhkEntityToListOutput(LqXhHyhkEntity it)
          {
              return new LqXhHyhkListOutput
              {
                  id = it.Id,
                  md = it.Md,
                  mdbh = it.Mdbh,
                  mdmc = it.Mdmc,
                  hy = it.Hy,
                  hyzh = it.Hyzh,
                  hymc = it.Hymc,
                  memberPhone = it.MemberPhone,
                  gklx = it.Gklx,
                  xfje = it.Xfje?.ToString(),
                  sgfy = it.Sgfy?.ToString(),
                  sfykjb = it.Sfykjb,
                  hksj = it.Hksj,
                  czry = it.Czry,
                  isEffective = it.IsEffective,
                  signatureFile = it.SignatureFile,
                  remark = it.Remark,
                  overtimeCoefficient = it.OvertimeCoefficient,
                  originalSgfy = it.OriginalSgfy,
                  overtimeSgfy = it.OvertimeSgfy,
                  appointmentId = it.AppointmentId,
              };
          }
  
          private async Task FillListMemberJdqdAsync(List<LqXhHyhkListOutput> list)
          {
              if (list == null || list.Count == 0)
                  return;
  
              var memberIds = list.Select(x => x.hy).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
              if (!memberIds.Any())
                  return;
  
              var memberChannels = await _db.Queryable<LqKhxxEntity>()
                  .Where(x => memberIds.Contains(x.Id))
                  .Select(x => new { x.Id, x.Jdqd })
                  .ToListAsync();
              var channelDict = memberChannels.ToDictionary(x => x.Id, x => x.Jdqd);
  
              foreach (var item in list)
              {
                  if (!string.IsNullOrEmpty(item.hy) && channelDict.TryGetValue(item.hy, out var jdqd))
                      item.jdqd = jdqd;
              }
          }
  
          private async Task<List<LqXhPxmxInfoOutput>> QueryConsumeDetailOutputsAsync(List<string> consumeIds)
          {
              if (consumeIds == null || !consumeIds.Any())
                  return new List<LqXhPxmxInfoOutput>();
  
              return await _db.Queryable<LqXhPxmxEntity>()
                  .Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                  .Select(x => new LqXhPxmxInfoOutput
                  {
                      id = x.Id,
                      consumeInfoId = x.ConsumeInfoId,
                      billingItemId = x.BillingItemId,
                      px = x.Px,
                      pxmc = x.Pxmc,
                      pxjg = x.Pxjg,
                      memberId = x.MemberId,
                      createTime = x.CreateTIme,
                      projectNumber = x.ProjectNumber,
                      originalProjectNumber = x.OriginalProjectNumber,
                      overtimeProjectNumber = x.OvertimeProjectNumber,
                      sourceType = x.SourceType,
                      totalPrice = x.TotalPrice,
                      isEffective = x.IsEffective,
                  })
                  .ToListAsync();
          }
  
          private async Task AttachConsumeDetailsToListAsync(List<LqXhHyhkListOutput> list)
          {
              if (list == null || list.Count == 0)
                  return;
  
              var consumeIds = list.Select(x => x.id).Where(x => !string.IsNullOrEmpty(x)).ToList();
              var consumeDetails = await QueryConsumeDetailOutputsAsync(consumeIds);
              var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
                  .ToDictionary(g => g.Key, g => g.ToList());
  
              foreach (var item in list)
              {
                  item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
                      ? consumeDetailsGrouped[item.id]
                      : new List<LqXhPxmxInfoOutput>();
              }
          }
  
          private static SqlSugarPagedList<LqXhHyhkListOutput> BuildHyhkListPageResult(
              SqlSugarPagedList<LqXhHyhkEntity> entityPage,
              List<LqXhHyhkListOutput> outputList)
          {
              return new SqlSugarPagedList<LqXhHyhkListOutput>
              {
                  list = outputList,
                  pagination = entityPage?.pagination
              };
          }
  
          /// <summary>
          /// 列表排序字段:前端/DTO 使用 camelCase,数据库列名需映射(如 id -> F_Id
          /// </summary>
          private static string ResolveHyhkListOrderBy(string sidx, string sort)
          {
              var field = string.IsNullOrWhiteSpace(sidx) ? "hksj" : sidx.Trim();
              var direction = string.Equals(sort, "asc", StringComparison.OrdinalIgnoreCase) ? "asc" : "desc";
  
              var column = field.ToLowerInvariant() switch
              {
                  "id" => "F_Id",
                  "memberphone" => "F_MemberPhone",
                  "hksj" => "hksj",
                  "hymc" => "hymc",
                  "hyzh" => "hyzh",
                  "hy" => "hy",
                  "md" => "md",
                  "mdbh" => "mdbh",
                  "mdmc" => "mdmc",
                  "gklx" => "gklx",
                  "xfje" => "xfje",
                  "sgfy" => "sgfy",
                  "sfykjb" => "sfykjb",
                  "czry" => "czry",
                  _ => "hksj"
              };
  
              return $"{column} {direction}";
          }
  
          #endregion
  
96009bc9   hexiaodong   hxd
2828
2829
      }
  }