Blame view

netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs 36.6 KB
c842ad9a   “wangming”   Remove analyze_ex...
1
2
3
4
5
6
7
8
9
10
  using System;
  using System.Collections.Generic;
  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
11
12
13
  using NCC.Common.Enum;
  using NCC.Common.Extension;
  using NCC.Common.Filter;
c842ad9a   “wangming”   Remove analyze_ex...
14
15
16
  using NCC.Common.Helper;
  using NCC.Common.Model.NPOI;
  using NCC.DataEncryption;
96009bc9   hexiaodong   hxd
17
18
  using NCC.Dependency;
  using NCC.DynamicApiController;
96009bc9   hexiaodong   hxd
19
  using NCC.Extend.Entitys.Dto.LqKhxx;
c842ad9a   “wangming”   Remove analyze_ex...
20
21
22
  using NCC.Extend.Entitys.Dto.LqXhHyhk;
  using NCC.Extend.Entitys.lq_hytk_hytk;
  using NCC.Extend.Entitys.lq_hytk_mx;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
23
24
  using NCC.Extend.Entitys.lq_kd_kdjlb;
  using NCC.Extend.Entitys.lq_kd_pxmx;
c842ad9a   “wangming”   Remove analyze_ex...
25
  using NCC.Extend.Entitys.lq_khxx;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
26
27
  using NCC.Extend.Entitys.lq_xh_hyhk;
  using NCC.Extend.Entitys.lq_xh_pxmx;
c842ad9a   “wangming”   Remove analyze_ex...
28
29
  using NCC.Extend.Interfaces.LqKhxx;
  using NCC.FriendlyException;
96009bc9   hexiaodong   hxd
30
  using NCC.JsonSerialization;
c842ad9a   “wangming”   Remove analyze_ex...
31
32
  using SqlSugar;
  using Yitter.IdGenerator;
96009bc9   hexiaodong   hxd
33
34
35
36
  
  namespace NCC.Extend.LqKhxx
  {
      /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
37
      /// 绿纤客户(会员)资料服务
96009bc9   hexiaodong   hxd
38
      /// </summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
39
      [ApiDescriptionSettings(Tag = "绿纤客户(会员)资料服务", Name = "LqKhxx", Order = 200)]
96009bc9   hexiaodong   hxd
40
41
42
43
44
45
      [Route("api/Extend/[controller]")]
      public class LqKhxxService : ILqKhxxService, IDynamicApiController, ITransient
      {
          private readonly ISqlSugarRepository<LqKhxxEntity> _lqKhxxRepository;
          private readonly SqlSugarScope _db;
          private readonly IUserManager _userManager;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
46
          private readonly ILogger<LqKhxxService> _logger;
96009bc9   hexiaodong   hxd
47
48
49
50
  
          /// <summary>
          /// 初始化一个<see cref="LqKhxxService"/>类型的新实例
          /// </summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
51
          public LqKhxxService(ISqlSugarRepository<LqKhxxEntity> lqKhxxRepository, IUserManager userManager, ILogger<LqKhxxService> logger)
96009bc9   hexiaodong   hxd
52
          {
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
53
              _lqKhxxRepository = lqKhxxRepository;
96009bc9   hexiaodong   hxd
54
55
              _db = _lqKhxxRepository.Context;
              _userManager = userManager;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
56
              _logger = logger;
96009bc9   hexiaodong   hxd
57
          }
c842ad9a   “wangming”   Remove analyze_ex...
58
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
59
          #region 客户资料
96009bc9   hexiaodong   hxd
60
61
62
63
64
65
66
67
68
69
70
71
          /// <summary>
          /// 获取客户资料
          /// </summary>
          /// <param name="id">参数</param>
          /// <returns></returns>
          [HttpGet("{id}")]
          public async Task<dynamic> GetInfo(string id)
          {
              var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
              var output = entity.Adapt<LqKhxxInfoOutput>();
              return output;
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
72
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
73
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
74
          #region 客户资料列表
96009bc9   hexiaodong   hxd
75
          /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
76
77
78
79
          /// 获取客户资料列表
          /// </summary>
          /// <param name="input">请求参数</param>
          /// <returns></returns>
96009bc9   hexiaodong   hxd
80
81
82
83
          [HttpGet("")]
          public async Task<dynamic> GetList([FromQuery] LqKhxxListQueryInput input)
          {
              var sidx = input.sidx == null ? "id" : input.sidx;
96009bc9   hexiaodong   hxd
84
85
86
87
88
89
90
91
92
              var data = await _db.Queryable<LqKhxxEntity>()
                  .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                  .WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
                  .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
                  .WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
                  .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
                  .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
                  .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
                  .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
96009bc9   hexiaodong   hxd
93
94
                  .WhereIF(!string.IsNullOrEmpty(input.khmqgs), p => p.Khmqgs.Equals(input.khmqgs))
                  .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
96009bc9   hexiaodong   hxd
95
96
97
98
99
100
101
102
103
104
                  .WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
                  .WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
                  .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
                  .WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
                  .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
                  .WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
                  .WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
                  .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                  .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                  .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
96009bc9   hexiaodong   hxd
105
                  .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
106
                  .Select(it => new LqKhxxListOutput
96009bc9   hexiaodong   hxd
107
108
                  {
                      id = it.Id,
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
                      khmc = it.Khmc,
                      sjh = it.Sjh,
                      dah = it.Dah,
                      xb = it.Xb,
                      gzhzt = it.Gzhzt,
                      wxnc = it.Wxnc,
                      wxxcxzt = it.Wxxcxzt,
                      zjdlsj = it.Zjdlsj,
                      khmqgs = it.Khmqgs,
                      gsmd = it.Gsmd,
                      zcsj = it.Zcsj,
                      khlx = it.Khlx,
                      khjd = it.Khjd,
                      khxf = it.Khxf,
                      xfpc = it.Xfpc,
                      tjr = it.Tjr,
                      fzgw = it.Fzgw,
                      mrs = it.Mrs,
                      jdqd = it.Jdqd,
                      lxdz = it.Lxdz,
                      bz = it.Bz,
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
130
131
132
                      yanglsr = it.Yanglsr,
                      yinlsr = it.Yinlsr,
                      ml = it.Ml,
c6d1116d   “wangming”   修复了查询接口报错的问题
133
                      createTime = it.CreateTime,
c842ad9a   “wangming”   Remove analyze_ex...
134
135
136
137
                  })
                  .MergeTable()
                  .OrderBy(sidx + " " + input.sort)
                  .ToPagedListAsync(input.currentPage, input.pageSize);
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
138
              return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
96009bc9   hexiaodong   hxd
139
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
140
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
141
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
142
          #region 新建客户资料
96009bc9   hexiaodong   hxd
143
144
145
146
147
148
149
150
151
          /// <summary>
          /// 新建客户资料
          /// </summary>
          /// <param name="input">参数</param>
          /// <returns></returns>
          [HttpPost("")]
          public async Task Create([FromBody] LqKhxxCrInput input)
          {
              var userInfo = await _userManager.GetUserInfo();
920afb29   “wangming”   修改了一摩尔的东西,我一个人在客户...
152
153
154
155
156
157
              //判断手机号是否存在
              var user = _db.Queryable<LqKhxxEntity>().Where(u => u.Sjh == input.sjh).Any();
              if (user)
              {
                  throw NCCException.Oh("该会员已存在");
              }
96009bc9   hexiaodong   hxd
158
159
              var entity = input.Adapt<LqKhxxEntity>();
              entity.Id = YitIdHelper.NextId().ToString();
bff07b1f   “wangming”   Refactor FileVari...
160
161
162
163
164
165
166
  
              // 处理客户消费字段:将数组转换为逗号分隔的字符串
              if (input.khxf != null && input.khxf.Count > 0)
              {
                  entity.Khxf = string.Join(",", input.khxf);
              }
  
96009bc9   hexiaodong   hxd
167
              var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
c842ad9a   “wangming”   Remove analyze_ex...
168
169
              if (!(isOk > 0))
                  throw NCCException.Oh(ErrorCode.COM1000);
96009bc9   hexiaodong   hxd
170
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
171
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
172
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
173
          #region 获取客户资料无分页列表
96009bc9   hexiaodong   hxd
174
          /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
175
176
177
178
          /// 获取客户资料无分页列表
          /// </summary>
          /// <param name="input">请求参数</param>
          /// <returns></returns>
96009bc9   hexiaodong   hxd
179
180
181
182
183
184
185
186
187
188
          [NonAction]
          public async Task<dynamic> GetNoPagingList([FromQuery] LqKhxxListQueryInput input)
          {
              var sidx = input.sidx == null ? "id" : input.sidx;
              List<string> queryZjdlsj = input.zjdlsj != null ? input.zjdlsj.Split(',').ToObeject<List<string>>() : null;
              DateTime? startZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.First()) : null;
              DateTime? endZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.Last()) : null;
              List<string> queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject<List<string>>() : null;
              DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null;
              DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null;
96009bc9   hexiaodong   hxd
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
              List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
              DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
              DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
              List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
              DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
              DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
              var data = await _db.Queryable<LqKhxxEntity>()
                  .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                  .WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
                  .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
                  .WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
                  .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
                  .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
                  .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
                  .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
204
205
                  //       .WhereIF(queryZjdlsj != null, p => p.Zjdlsj >= new DateTime(startZjdlsj.ToDate().Year, startZjdlsj.ToDate().Month, startZjdlsj.ToDate().Day, 0, 0, 0))
                  //    .WhereIF(queryZjdlsj != null, p => p.Zjdlsj <= new DateTime(endZjdlsj.ToDate().Year, endZjdlsj.ToDate().Month, endZjdlsj.ToDate().Day, 23, 59, 59))
96009bc9   hexiaodong   hxd
206
207
208
209
210
211
212
213
214
215
216
217
218
219
                  .WhereIF(!string.IsNullOrEmpty(input.khmqgs), p => p.Khmqgs.Equals(input.khmqgs))
                  .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
                  .WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
                  .WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
                  .WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
                  .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Equals(input.khxf))
                  .WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
                  .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
                  .WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
                  .WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
                  .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                  .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                  .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
96009bc9   hexiaodong   hxd
220
221
222
223
224
                  .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
                  .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
                  .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
225
                  .Select(it => new LqKhxxListOutput
96009bc9   hexiaodong   hxd
226
227
                  {
                      id = it.Id,
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
                      khmc = it.Khmc,
                      sjh = it.Sjh,
                      dah = it.Dah,
                      xb = it.Xb,
                      gzhzt = it.Gzhzt,
                      wxnc = it.Wxnc,
                      wxxcxzt = it.Wxxcxzt,
                      zjdlsj = it.Zjdlsj,
                      khmqgs = it.Khmqgs,
                      gsmd = it.Gsmd,
                      zcsj = it.Zcsj,
                      khlx = it.Khlx,
                      khjd = it.Khjd,
                      khxf = it.Khxf,
                      xfpc = it.Xfpc,
                      tjr = it.Tjr,
                      fzgw = it.Fzgw,
                      mrs = it.Mrs,
                      jdqd = it.Jdqd,
                      lxdz = it.Lxdz,
                      bz = it.Bz,
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
249
250
251
                      yanglsr = it.Yanglsr,
                      yinlsr = it.Yinlsr,
                      ml = it.Ml,
c6d1116d   “wangming”   修复了查询接口报错的问题
252
                      createTime = it.CreateTime,
c842ad9a   “wangming”   Remove analyze_ex...
253
254
255
256
                  })
                  .MergeTable()
                  .OrderBy(sidx + " " + input.sort)
                  .ToListAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
257
              return data;
96009bc9   hexiaodong   hxd
258
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
259
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
260
  
920afb29   “wangming”   修改了一摩尔的东西,我一个人在客户...
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
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
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
          #region 获取线索池客户列表
          /// <summary>
          /// 获取线索池客户列表
          /// </summary>
          /// <param name="input">查询参数</param>
          /// <returns>线索池客户列表</returns>
          [HttpGet("leads-pool")]
          public async Task<PageResult<LqKhxxListOutput>> GetLeadsPoolList([FromQuery] LqKhxxListQueryInput input)
          {
              var sidx = input.sidx == null ? "id" : input.sidx;
              List<string> queryZjdlsj = input.zjdlsj != null ? input.zjdlsj.Split(',').ToObeject<List<string>>() : null;
              DateTime? startZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.First()) : null;
              DateTime? endZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.Last()) : null;
              List<string> queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject<List<string>>() : null;
              DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null;
              DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null;
              List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
              DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
              DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
              List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
              DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
              DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
  
              var data = await _db.Queryable<LqKhxxEntity>()
                  .Where(p => p.Khmqgs == "线索池") // 固定查询线索池客户
                  .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                  .WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
                  .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
                  .WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
                  .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
                  .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
                  .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
                  .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
                  .WhereIF(!string.IsNullOrEmpty(input.khmqgs), p => p.Khmqgs.Equals(input.khmqgs))
                  .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
                  .WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
                  .WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
                  .WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
                  .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
                  .WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
                  .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
                  .WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
                  .WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
                  .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                  .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                  .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
                  .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
                  .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
                  .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
                  .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
                  .Select(it => new LqKhxxListOutput
                  {
                      id = it.Id,
                      khmc = it.Khmc,
                      sjh = it.Sjh,
                      dah = it.Dah,
                      xb = it.Xb,
                      gzhzt = it.Gzhzt,
                      wxnc = it.Wxnc,
                      wxxcxzt = it.Wxxcxzt,
                      zjdlsj = it.Zjdlsj,
                      khmqgs = it.Khmqgs,
                      gsmd = it.Gsmd,
                      zcsj = it.Zcsj,
                      khlx = it.Khlx,
                      khjd = it.Khjd,
                      khxf = it.Khxf,
                      xfpc = it.Xfpc,
                      tjr = it.Tjr,
                      fzgw = it.Fzgw,
                      mrs = it.Mrs,
                      jdqd = it.Jdqd,
                      lxdz = it.Lxdz,
                      bz = it.Bz,
                      yanglsr = it.Yanglsr,
                      yinlsr = it.Yinlsr,
                      ml = it.Ml,
c6d1116d   “wangming”   修复了查询接口报错的问题
340
                      createTime = it.CreateTime,
920afb29   “wangming”   修改了一摩尔的东西,我一个人在客户...
341
342
343
344
345
346
347
348
                  })
                  .MergeTable()
                  .OrderBy(sidx + " " + input.sort)
                  .ToPagedListAsync(input.currentPage, input.pageSize);
              return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
          }
          #endregion
  
850bf205   “wangming”   Add ActualPrice f...
349
          #region 获取客户订单类型(首单/升单)
920afb29   “wangming”   修改了一摩尔的东西,我一个人在客户...
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
          /// <summary>
          /// 获取客户订单类型(首单/升单)
          /// </summary>
          /// <param name="customerId">客户ID</param>
          /// <returns>客户订单类型信息</returns>
          [HttpGet("order-type/{customerId}")]
          public async Task<LqKhxxOrderTypeOutput> GetCustomerOrderType(string customerId)
          {
              if (string.IsNullOrEmpty(customerId))
              {
                  throw NCCException.Oh("客户ID不能为空");
              }
  
              // 查询客户是否存在
              var customerExists = await _db.Queryable<LqKhxxEntity>().Where(c => c.Id == customerId).AnyAsync();
  
              if (!customerExists)
              {
                  throw NCCException.Oh("客户不存在");
              }
  
              // 查询开单记录数量
              var orderCount = await _db.Queryable<LqKdKdjlbEntity>().Where(o => o.Kdhy == customerId).CountAsync();
  
              var hasOrderRecord = orderCount > 0;
              var orderType = hasOrderRecord ? "repeat_order" : "first_order";
  
              return new LqKhxxOrderTypeOutput
              {
                  CustomerId = customerId,
                  OrderType = orderType,
                  HasOrderRecord = hasOrderRecord,
                  OrderCount = orderCount,
              };
          }
          #endregion
  
c842ad9a   “wangming”   Remove analyze_ex...
387
          #region 导出客户资料
96009bc9   hexiaodong   hxd
388
          /// <summary>
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
389
390
391
392
          /// 导出客户资料
          /// </summary>
          /// <param name="input">请求参数</param>
          /// <returns></returns>
96009bc9   hexiaodong   hxd
393
394
395
396
397
398
399
400
401
402
403
404
405
406
          [HttpGet("Actions/Export")]
          public async Task<dynamic> Export([FromQuery] LqKhxxListQueryInput input)
          {
              var userInfo = await _userManager.GetUserInfo();
              var exportData = new List<LqKhxxListOutput>();
              if (input.dataType == 0)
              {
                  var data = Clay.Object(await this.GetList(input));
                  exportData = data.Solidify<PageResult<LqKhxxListOutput>>().list;
              }
              else
              {
                  exportData = await this.GetNoPagingList(input);
              }
c842ad9a   “wangming”   Remove analyze_ex...
407
408
              List<ParamsModel> paramList =
                  "[{\"value\":\"客户编码\",\"field\":\"id\"},{\"value\":\"客户名称\",\"field\":\"khmc\"},{\"value\":\"手机号\",\"field\":\"sjh\"},{\"value\":\"档案号\",\"field\":\"dah\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"公众号状态\",\"field\":\"gzhzt\"},{\"value\":\"微信昵称\",\"field\":\"wxnc\"},{\"value\":\"小程序状态\",\"field\":\"wxxcxzt\"},{\"value\":\"最近登录时间\",\"field\":\"zjdlsj\"},{\"value\":\"客户目前归属\",\"field\":\"khmqgs\"},{\"value\":\"归属门店\",\"field\":\"gsmd\"},{\"value\":\"注册时间\",\"field\":\"zcsj\"},{\"value\":\"客户类型\",\"field\":\"khlx\"},{\"value\":\"客户阶段\",\"field\":\"khjd\"},{\"value\":\"客户消费\",\"field\":\"khxf\"},{\"value\":\"消费频次\",\"field\":\"xfpc\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"负责顾问\",\"field\":\"fzgw\"},{\"value\":\"美容师\",\"field\":\"mrs\"},{\"value\":\"进店渠道\",\"field\":\"jdqd\"},{\"value\":\"联系地址\",\"field\":\"lxdz\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"阳历生日\",\"field\":\"yanglsr\"},{\"value\":\"阴历生日\",\"field\":\"yinlsr\"},{\"value\":\"年龄\",\"field\":\"ml\"},]".ToList<ParamsModel>();
96009bc9   hexiaodong   hxd
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
              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<LqKhxxListOutput>.Export(exportData, excelconfig, addPath);
              var fileName = _userManager.UserId + "|" + addPath + "|xls";
c842ad9a   “wangming”   Remove analyze_ex...
427
              var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
96009bc9   hexiaodong   hxd
428
429
              return output;
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
430
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
431
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
432
          #region 批量删除客户资料
96009bc9   hexiaodong   hxd
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
          /// <summary>
          /// 批量删除客户资料
          /// </summary>
          /// <param name="ids">主键数组</param>
          /// <returns></returns>
          [HttpPost("batchRemove")]
          public async Task BatchRemove([FromBody] List<string> ids)
          {
              var entitys = await _db.Queryable<LqKhxxEntity>().In(it => it.Id, ids).ToListAsync();
              if (entitys.Count > 0)
              {
                  try
                  {
                      //开启事务
                      _db.BeginTran();
                      //批量删除客户资料
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
449
                      await _db.Deleteable<LqKhxxEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
96009bc9   hexiaodong   hxd
450
451
452
453
454
455
456
457
458
459
460
                      //关闭事务
                      _db.CommitTran();
                  }
                  catch (Exception)
                  {
                      //回滚事务
                      _db.RollbackTran();
                      throw NCCException.Oh(ErrorCode.COM1002);
                  }
              }
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
461
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
462
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
463
          #region 更新客户资料
96009bc9   hexiaodong   hxd
464
465
466
467
468
469
470
471
472
473
          /// <summary>
          /// 更新客户资料
          /// </summary>
          /// <param name="id">主键</param>
          /// <param name="input">参数</param>
          /// <returns></returns>
          [HttpPut("{id}")]
          public async Task Update(string id, [FromBody] LqKhxxUpInput input)
          {
              var entity = input.Adapt<LqKhxxEntity>();
bff07b1f   “wangming”   Refactor FileVari...
474
475
476
477
478
479
480
  
              // 处理客户消费字段:将数组转换为逗号分隔的字符串
              if (input.khxf != null && input.khxf.Count > 0)
              {
                  entity.Khxf = string.Join(",", input.khxf);
              }
  
96009bc9   hexiaodong   hxd
481
              var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
c842ad9a   “wangming”   Remove analyze_ex...
482
483
              if (!(isOk > 0))
                  throw NCCException.Oh(ErrorCode.COM1001);
96009bc9   hexiaodong   hxd
484
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
485
          #endregion
c842ad9a   “wangming”   Remove analyze_ex...
486
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
487
          #region 删除客户资料
96009bc9   hexiaodong   hxd
488
489
490
491
492
493
494
495
496
497
          /// <summary>
          /// 删除客户资料
          /// </summary>
          /// <returns></returns>
          [HttpDelete("{id}")]
          public async Task Delete(string id)
          {
              var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
              _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
              var isOk = await _db.Deleteable<LqKhxxEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
c842ad9a   “wangming”   Remove analyze_ex...
498
499
              if (!(isOk > 0))
                  throw NCCException.Oh(ErrorCode.COM1002);
96009bc9   hexiaodong   hxd
500
          }
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
501
502
503
504
505
506
507
508
509
          #endregion
  
          #region 查询会员剩余品项
          /// <summary>
          /// 查询会员剩余品项信息
          /// </summary>
          /// <remarks>
          /// 根据会员ID查询该会员的剩余品项信息,包括已购买但未消费完的品项详情
          /// 支持按来源类型(F_SourceType)区分相同品项的不同来源,确保数据准确分组
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
510
          /// 计算逻辑:剩余数量 = 购买数量 - 消费数量 - 退卡数量
c842ad9a   “wangming”   Remove analyze_ex...
511
          ///
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
512
513
514
515
          /// 示例请求:
          /// ```json
          /// GET /api/Extend/LqKhxx/GetMemberRemainingItems?memberId=GK2025022100004
          /// ```
c842ad9a   “wangming”   Remove analyze_ex...
516
          ///
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
517
518
          /// 参数说明:
          /// - memberId: 会员ID,必填参数
c842ad9a   “wangming”   Remove analyze_ex...
519
          ///
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
520
521
522
523
524
525
526
527
528
529
          /// 返回数据结构:
          /// - MemberId: 会员ID
          /// - MemberName: 会员姓名
          /// - RemainingItems: 剩余品项列表
          ///   - ItemId: 品项ID
          ///   - ItemName: 品项名称
          ///   - ItemPrice: 品项单价
          ///   - SourceType: 来源类型(用于区分相同品项的不同来源)
          ///   - TotalPurchased: 总购买数量
          ///   - ConsumedCount: 已消费数量
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
530
          ///   - RefundedCount: 已退卡数量
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
531
          ///   - RemainingCount: 剩余数量
c842ad9a   “wangming”   Remove analyze_ex...
532
          ///
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
533
534
          /// 特殊说明:
          /// - 相同品项但不同SourceType的记录会分开显示
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
535
          /// - 耗卡和退卡统计会按品项IDSourceType精确匹配
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
536
          /// - 确保数据按SourceType正确分组且不重叠
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
537
          /// - 退卡记录会减少剩余品项数量
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
          /// </remarks>
          /// <param name="memberId">会员ID</param>
          /// <returns>会员剩余品项信息</returns>
          /// <response code="200">成功返回会员剩余品项信息</response>
          /// <response code="400">参数错误,会员ID不能为空</response>
          /// <response code="500">服务器错误或会员不存在</response>
          [HttpGet("GetMemberRemainingItems")]
          public async Task<MemberRemainingItemsOutput> GetMemberRemainingItems(string memberId)
          {
              if (string.IsNullOrEmpty(memberId))
              {
                  throw NCCException.Oh(ErrorCode.COM1000, "会员ID不能为空");
              }
  
              try
              {
                  _logger.LogInformation("开始查询会员剩余品项,会员ID:{MemberId}", memberId);
  
                  // 1. 查询会员基本信息
c842ad9a   “wangming”   Remove analyze_ex...
557
                  var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(x => x.Id == memberId).FirstAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
558
559
560
561
562
563
564
565
566
567
568
  
                  if (memberInfo == null)
                  {
                      _logger.LogWarning("会员不存在,会员ID:{MemberId}", memberId);
                      throw NCCException.Oh(ErrorCode.COM1005, "会员不存在");
                  }
  
                  _logger.LogInformation("会员信息查询成功,会员姓名:{MemberName}", memberInfo.Khmc);
  
                  // 2. 查询开单记录ID列表
                  _logger.LogInformation("开始查询开单记录ID列表");
c842ad9a   “wangming”   Remove analyze_ex...
569
                  var orderIds = await _db.Queryable<LqKdKdjlbEntity>().Where(kd => kd.Kdhy == memberId).Select(kd => kd.Id).ToListAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
570
571
572
573
574
575
576
577
578
579
  
                  _logger.LogInformation("开单记录ID列表查询成功,数量:{Count}", orderIds.Count);
  
                  // 3. 查询开单品项统计(按品项ID、名称、价格和来源类型分组)
                  _logger.LogInformation("开始查询开单品项统计");
                  var purchasedItems = new List<dynamic>();
                  if (orderIds.Any())
                  {
                      var tempPurchasedItems = await _db.Queryable<LqKdPxmxEntity>()
                          .Where(px => orderIds.Contains(px.Glkdbh))
c842ad9a   “wangming”   Remove analyze_ex...
580
581
582
583
584
585
586
                          .GroupBy(px => new
                          {
                              px.Px,
                              px.Pxmc,
                              px.Pxjg,
                              px.SourceType,
                          })
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
587
588
589
590
591
592
                          .Select(px => new
                          {
                              ItemId = px.Px,
                              ItemName = px.Pxmc,
                              ItemPrice = px.Pxjg,
                              SourceType = SqlFunc.IsNull(px.SourceType, "未知"),
c842ad9a   “wangming”   Remove analyze_ex...
593
                              TotalPurchased = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.ProjectNumber)),
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
594
595
596
597
598
                          })
                          .ToListAsync();
  
                      purchasedItems = tempPurchasedItems.Cast<dynamic>().ToList();
                      _logger.LogInformation("开单品项统计查询成功,数量:{Count}", purchasedItems.Count);
c842ad9a   “wangming”   Remove analyze_ex...
599
  
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
600
601
602
603
604
605
606
607
608
                      // 调试:输出前几条记录查看SourceType字段
                      foreach (var item in purchasedItems.Take(3))
                      {
                          _logger.LogInformation($"调试 - 品项ID: {item.ItemId}, 品项名称: {item.ItemName}, 来源类型: {item.SourceType}");
                      }
                  }
  
                  // 4. 查询耗卡记录ID列表
                  _logger.LogInformation("开始查询耗卡记录ID列表");
c842ad9a   “wangming”   Remove analyze_ex...
609
                  var consumeIds = await _db.Queryable<LqXhHyhkEntity>().Where(hk => hk.Hy == memberId).Select(hk => hk.Id).ToListAsync();
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
  
                  _logger.LogInformation("耗卡记录ID列表查询成功,数量:{Count}", consumeIds.Count);
  
                  // 5. 查询耗卡品项统计(按品项ID和来源类型分组)
                  _logger.LogInformation("开始查询耗卡品项统计");
                  var consumedItems = new List<dynamic>();
                  if (consumeIds.Any())
                  {
                      var tempConsumedItems = await _db.Queryable<LqXhPxmxEntity>()
                          .Where(px => consumeIds.Contains(px.Glkdbh))
                          .GroupBy(px => new { px.Px, px.SourceType })
                          .Select(px => new
                          {
                              ItemId = px.Px,
                              SourceType = SqlFunc.IsNull(px.SourceType, "未知"),
c842ad9a   “wangming”   Remove analyze_ex...
625
                              ConsumedCount = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.ProjectNumber)),
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
626
627
628
629
630
631
632
                          })
                          .ToListAsync();
  
                      consumedItems = tempConsumedItems.Cast<dynamic>().ToList();
                      _logger.LogInformation("耗卡品项统计查询成功,数量:{Count}", consumedItems.Count);
                  }
  
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
633
634
                  // 6. 查询退卡记录ID列表
                  _logger.LogInformation("开始查询退卡记录ID列表");
c842ad9a   “wangming”   Remove analyze_ex...
635
                  var refundIds = await _db.Queryable<LqHytkHytkEntity>().Where(tk => tk.Hy == memberId && tk.F_DeleteMark != 1).Select(tk => tk.Id).ToListAsync();
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
  
                  _logger.LogInformation("退卡记录ID列表查询成功,数量:{Count}", refundIds.Count);
  
                  // 7. 查询退卡品项统计(按品项ID和来源类型分组)
                  _logger.LogInformation("开始查询退卡品项统计");
                  var refundedItems = new List<dynamic>();
                  if (refundIds.Any())
                  {
                      var tempRefundedItems = await _db.Queryable<LqHytkMxEntity>()
                          .Where(px => refundIds.Contains(px.Gltkbh) && px.F_DeleteMark != 1)
                          .GroupBy(px => new { px.Px, px.F_SourceType })
                          .Select(px => new
                          {
                              ItemId = px.Px,
                              SourceType = SqlFunc.IsNull(px.F_SourceType, "未知"),
c842ad9a   “wangming”   Remove analyze_ex...
651
                              RefundedCount = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.F_ProjectNumber)),
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
652
653
654
655
656
657
658
659
                          })
                          .ToListAsync();
  
                      refundedItems = tempRefundedItems.Cast<dynamic>().ToList();
                      _logger.LogInformation("退卡品项统计查询成功,数量:{Count}", refundedItems.Count);
                  }
  
                  // 8. 合并计算剩余品项(按品项ID和来源类型匹配)
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
660
661
662
663
664
665
666
                  _logger.LogInformation("开始合并计算剩余品项");
                  var remainingItems = new List<RemainingItemInfo>();
  
                  // 处理有购买记录的品项
                  foreach (var purchased in purchasedItems)
                  {
                      // 按品项ID和来源类型匹配耗卡记录
c842ad9a   “wangming”   Remove analyze_ex...
667
                      var consumed = consumedItems.FirstOrDefault(x => x.ItemId == purchased.ItemId && x.SourceType == purchased.SourceType);
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
668
                      var consumedCount = consumed?.ConsumedCount ?? 0;
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
669
670
  
                      // 按品项ID和来源类型匹配退卡记录
c842ad9a   “wangming”   Remove analyze_ex...
671
                      var refunded = refundedItems.FirstOrDefault(x => x.ItemId == purchased.ItemId && x.SourceType == purchased.SourceType);
2b23ca5e   “wangming”   更新退卡相关功能,重构退卡信息表及...
672
673
674
675
                      var refundedCount = refunded?.RefundedCount ?? 0;
  
                      // 计算剩余数量:购买数量 - 消费数量 - 退卡数量
                      var remainingCount = purchased.TotalPurchased - consumedCount - refundedCount;
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
676
677
678
  
                      if (remainingCount > 0)
                      {
c842ad9a   “wangming”   Remove analyze_ex...
679
680
681
682
683
684
685
686
687
688
689
690
691
                          remainingItems.Add(
                              new RemainingItemInfo
                              {
                                  ItemId = purchased.ItemId,
                                  ItemName = purchased.ItemName,
                                  ItemPrice = purchased.ItemPrice,
                                  SourceType = purchased.SourceType?.ToString() ?? "未知",
                                  TotalPurchased = purchased.TotalPurchased,
                                  ConsumedCount = consumedCount,
                                  RefundedCount = refundedCount,
                                  RemainingCount = remainingCount,
                              }
                          );
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
692
693
694
695
696
697
698
699
700
701
702
703
                      }
                  }
  
                  // 7. 按剩余数量降序排列
                  remainingItems = remainingItems.OrderByDescending(x => x.RemainingCount).ToList();
  
                  _logger.LogInformation("剩余品项计算完成,数量:{Count}", remainingItems.Count);
  
                  return new MemberRemainingItemsOutput
                  {
                      MemberId = memberId,
                      MemberName = memberInfo.Khmc,
c842ad9a   “wangming”   Remove analyze_ex...
704
                      RemainingItems = remainingItems,
35bb18d3   “wangming”   更新多个.DS_Store文件,删...
705
706
707
708
709
710
711
712
713
                  };
              }
              catch (Exception ex)
              {
                  _logger.LogError(ex, "查询会员剩余品项失败,会员ID:{MemberId}", memberId);
                  throw NCCException.Oh(ErrorCode.COM1005, "查询会员剩余品项失败");
              }
          }
          #endregion
96009bc9   hexiaodong   hxd
714
715
      }
  }