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;
|
41da4257
“wangming”
Refactor LqEventS...
|
19
|
using NCC.Extend.Entitys.Dto.Common;
|
96009bc9
hexiaodong
hxd
|
20
|
using NCC.Extend.Entitys.Dto.LqKhxx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
21
|
using NCC.Extend.Entitys.Dto.LqXhHyhk;
|
41da4257
“wangming”
Refactor LqEventS...
|
22
|
using NCC.Extend.Entitys.Enum;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
23
24
|
using NCC.Extend.Entitys.lq_hytk_hytk;
using NCC.Extend.Entitys.lq_hytk_mx;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
25
26
|
using NCC.Extend.Entitys.lq_kd_kdjlb;
using NCC.Extend.Entitys.lq_kd_pxmx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
27
|
using NCC.Extend.Entitys.lq_khxx;
|
7f83b333
“wangming”
重构:删除部门管理模块并修复预约记录服务
|
28
|
using NCC.Extend.Entitys.lq_mdxx;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
29
30
|
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_pxmx;
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
31
|
using NCC.Extend.Entitys.lq_xmzl;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
32
|
using NCC.Extend.Interfaces.LqKhxx;
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
33
|
using NCC.Extend.Entitys.Config;
|
0380c57d
“wangming”
修复项目编译错误和优化功能
|
34
|
using NCC.System.Entitys.Permission;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
35
|
using NCC.FriendlyException;
|
96009bc9
hexiaodong
hxd
|
36
|
using NCC.JsonSerialization;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
37
38
|
using SqlSugar;
using Yitter.IdGenerator;
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
39
|
using NCC.Extend.Entitys.lq_kd_deductinfo;
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
40
|
using Microsoft.AspNetCore.Authorization;
|
96009bc9
hexiaodong
hxd
|
41
42
43
44
|
namespace NCC.Extend.LqKhxx
{
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
45
|
/// 绿纤客户(会员)资料服务
|
96009bc9
hexiaodong
hxd
|
46
|
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
47
|
[ApiDescriptionSettings(Tag = "绿纤客户(会员)资料服务", Name = "LqKhxx", Order = 200)]
|
96009bc9
hexiaodong
hxd
|
48
49
50
51
52
53
|
[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文件,删...
|
54
|
private readonly ILogger<LqKhxxService> _logger;
|
96009bc9
hexiaodong
hxd
|
55
56
57
58
|
/// <summary>
/// 初始化一个<see cref="LqKhxxService"/>类型的新实例
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
59
|
public LqKhxxService(ISqlSugarRepository<LqKhxxEntity> lqKhxxRepository, IUserManager userManager, ILogger<LqKhxxService> logger)
|
96009bc9
hexiaodong
hxd
|
60
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
61
|
_lqKhxxRepository = lqKhxxRepository;
|
96009bc9
hexiaodong
hxd
|
62
63
|
_db = _lqKhxxRepository.Context;
_userManager = userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
64
|
_logger = logger;
|
96009bc9
hexiaodong
hxd
|
65
|
}
|
c842ad9a
“wangming”
Remove analyze_ex...
|
66
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
67
|
#region 客户资料
|
96009bc9
hexiaodong
hxd
|
68
69
70
71
72
73
74
75
76
77
|
/// <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>();
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
78
79
80
81
82
|
if (!string.IsNullOrEmpty(entity.ExpandUser))
{
var expandUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.ExpandUser).FirstAsync();
output.expandUserName = expandUser?.RealName ?? "";
}
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
83
84
85
86
87
88
|
if (!string.IsNullOrEmpty(entity.MainHealthUser))
{
var mainHealthUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.MainHealthUser).FirstAsync();
output.mainHealthUserName = mainHealthUser?.RealName ?? "";
}
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
89
90
91
92
93
94
|
if (!string.IsNullOrEmpty(entity.SubHealthUser))
{
var subHealthUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.SubHealthUser).FirstAsync();
output.subHealthUserName = subHealthUser?.RealName ?? "";
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
95
|
if (!string.IsNullOrEmpty(entity.Tjr))
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
96
|
{
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
97
98
|
var tjr = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.Tjr).FirstAsync();
output.tjrName = tjr?.RealName ?? "";
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
99
|
}
|
96009bc9
hexiaodong
hxd
|
100
101
|
return output;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
102
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
103
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
104
|
#region 客户资料列表
|
96009bc9
hexiaodong
hxd
|
105
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
106
107
108
109
|
/// 获取客户资料列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
110
111
112
113
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqKhxxListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
114
115
116
|
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
|
117
|
var data = await _db.Queryable<LqKhxxEntity>()
|
dac8767e
“wangming”
111111111
|
118
|
.WhereIF(!string.IsNullOrEmpty(input.keyWord), p => p.Khmc.Contains(input.keyWord) || p.Sjh.Contains(input.keyWord) || p.Dah.Contains(input.keyWord))
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
119
120
|
.WhereIF(input.IsTechMemberbh.HasValue, p => p.IsTechMember == input.IsTechMemberbh)
.WhereIF(input.IsEducationMember.HasValue, p => p.IsEducationMember == input.IsEducationMember)
|
96009bc9
hexiaodong
hxd
|
121
122
123
124
125
|
.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))
|
96009bc9
hexiaodong
hxd
|
126
|
.WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
|
96009bc9
hexiaodong
hxd
|
127
128
129
130
131
|
.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))
|
96009bc9
hexiaodong
hxd
|
132
133
134
|
.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))
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
135
136
|
.WhereIF(queryZcsj != null, p => p.CreateTime >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
.WhereIF(queryZcsj != null, p => p.CreateTime <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
137
|
.Select(it => new LqKhxxListOutput
|
96009bc9
hexiaodong
hxd
|
138
139
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
140
141
142
143
|
khmc = it.Khmc,
sjh = it.Sjh,
dah = it.Dah,
xb = it.Xb,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
144
|
gsmd = it.Gsmd,
|
7f83b333
“wangming”
重构:删除部门管理模块并修复预约记录服务
|
145
|
gsmdName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == it.Gsmd).Select(u => u.Dm),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
146
147
148
149
150
151
|
zcsj = it.Zcsj,
khlx = it.Khlx,
khjd = it.Khjd,
khxf = it.Khxf,
xfpc = it.Xfpc,
tjr = it.Tjr,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
152
153
154
|
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
155
156
|
yanglsr = it.Yanglsr,
yinlsr = it.Yinlsr,
|
c6d1116d
“wangming”
修复了查询接口报错的问题
|
157
|
createTime = it.CreateTime,
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
158
159
160
161
162
163
|
expandUser = it.ExpandUser,
mainHealthUser = it.MainHealthUser,
subHealthUser = it.SubHealthUser,
expandUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.ExpandUser).Select(u => u.RealName),
mainHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.MainHealthUser).Select(u => u.RealName),
subHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.SubHealthUser).Select(u => u.RealName),
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
164
|
tjrName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(u => u.Id == it.Tjr).Select(u => u.Khmc),
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
165
166
167
|
isBeautyMember = it.IsBeautyMember,
isMedicalMember = it.IsMedicalMember,
isTechMember = it.IsTechMember,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
168
|
isEducationMember = it.IsEducationMember,
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
169
170
171
|
beautyMemberTime = it.BeautyMemberTime,
medicalMemberTime = it.MedicalMemberTime,
techMemberTime = it.TechMemberTime,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
172
|
educationMemberTime = it.EducationMemberTime,
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
173
174
175
176
177
178
179
180
181
182
|
firstVisitTime = it.FirstVisitTime,
lastVisitTime = it.LastVisitTime,
visitDays = it.VisitDays,
sleepStartTime = it.SleepStartTime,
sleepDays = it.SleepDays,
totalConsumeAmount = it.TotalConsumeAmount,
totalBillingAmount = it.TotalBillingAmount,
remainingRightsAmount = it.RemainingRightsAmount,
consumeLevel = it.ConsumeLevel,
consumeLevelUpdateTime = it.ConsumeLevelUpdateTime
|
c842ad9a
“wangming”
Remove analyze_ex...
|
183
184
185
186
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
187
|
return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
188
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
189
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
190
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
191
|
#region 新建客户资料
|
96009bc9
hexiaodong
hxd
|
192
193
194
195
196
197
198
199
200
|
/// <summary>
/// 新建客户资料
/// </summary>
/// <param name="input">参数</param>
/// <returns></returns>
[HttpPost("")]
public async Task Create([FromBody] LqKhxxCrInput input)
{
var userInfo = await _userManager.GetUserInfo();
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
201
202
203
204
205
206
|
//判断手机号是否存在
var user = _db.Queryable<LqKhxxEntity>().Where(u => u.Sjh == input.sjh).Any();
if (user)
{
throw NCCException.Oh("该会员已存在");
}
|
96009bc9
hexiaodong
hxd
|
207
208
|
var entity = input.Adapt<LqKhxxEntity>();
entity.Id = YitIdHelper.NextId().ToString();
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
209
|
entity.Dah = "LQ" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
210
|
entity.Zcsj = DateTime.Now;
|
bff07b1f
“wangming”
Refactor FileVari...
|
211
212
213
214
215
216
|
// 处理客户消费字段:将数组转换为逗号分隔的字符串
if (input.khxf != null && input.khxf.Count > 0)
{
entity.Khxf = string.Join(",", input.khxf);
}
|
96009bc9
hexiaodong
hxd
|
217
|
var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
|
c842ad9a
“wangming”
Remove analyze_ex...
|
218
219
|
if (!(isOk > 0))
throw NCCException.Oh(ErrorCode.COM1000);
|
96009bc9
hexiaodong
hxd
|
220
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
221
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
222
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
223
|
#region 获取客户资料无分页列表
|
96009bc9
hexiaodong
hxd
|
224
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
225
226
227
228
|
/// 获取客户资料无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
229
230
231
232
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqKhxxListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
96009bc9
hexiaodong
hxd
|
233
234
235
|
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
|
236
237
238
239
240
241
242
243
244
245
246
247
|
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))
|
96009bc9
hexiaodong
hxd
|
248
249
250
251
252
253
254
255
|
.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))
|
96009bc9
hexiaodong
hxd
|
256
257
258
|
.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
|
259
260
261
262
|
.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))
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
263
|
.Select(it => new LqKhxxListOutput
|
96009bc9
hexiaodong
hxd
|
264
265
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
266
267
268
269
|
khmc = it.Khmc,
sjh = it.Sjh,
dah = it.Dah,
xb = it.Xb,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
270
271
272
273
274
275
276
|
gsmd = it.Gsmd,
zcsj = it.Zcsj,
khlx = it.Khlx,
khjd = it.Khjd,
khxf = it.Khxf,
xfpc = it.Xfpc,
tjr = it.Tjr,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
277
278
279
|
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
280
281
|
yanglsr = it.Yanglsr,
yinlsr = it.Yinlsr,
|
c6d1116d
“wangming”
修复了查询接口报错的问题
|
282
|
createTime = it.CreateTime,
|
c842ad9a
“wangming”
Remove analyze_ex...
|
283
284
285
286
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
287
|
return data;
|
96009bc9
hexiaodong
hxd
|
288
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
289
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
290
|
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
291
292
293
294
295
296
297
298
299
300
|
#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;
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
301
302
303
304
305
306
307
308
309
310
311
|
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>()
|
41da4257
“wangming”
Refactor LqEventS...
|
312
|
.Where(p => p.Khlx == "线索") // 固定查询线索池客户
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
313
314
315
316
317
|
.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))
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
318
319
320
321
322
323
324
325
|
.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))
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
326
327
328
329
330
331
332
|
.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))
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
333
334
335
336
337
338
339
|
.Select(it => new LqKhxxListOutput
{
id = it.Id,
khmc = it.Khmc,
sjh = it.Sjh,
dah = it.Dah,
xb = it.Xb,
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
340
341
342
343
344
345
346
|
gsmd = it.Gsmd,
zcsj = it.Zcsj,
khlx = it.Khlx,
khjd = it.Khjd,
khxf = it.Khxf,
xfpc = it.Xfpc,
tjr = it.Tjr,
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
347
348
349
350
351
|
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
yanglsr = it.Yanglsr,
yinlsr = it.Yinlsr,
|
c6d1116d
“wangming”
修复了查询接口报错的问题
|
352
|
createTime = it.CreateTime,
|
150862dd
“wangming”
修复GetInfo方法中的空值处理问题
|
353
354
355
|
expandUser = it.ExpandUser,
mainHealthUser = it.MainHealthUser,
subHealthUser = it.SubHealthUser,
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
356
357
358
359
360
361
362
363
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
}
#endregion
|
850bf205
“wangming”
Add ActualPrice f...
|
364
|
#region 获取客户订单类型(首单/升单)
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
365
366
367
368
369
370
371
372
373
374
375
376
|
/// <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不能为空");
}
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
377
378
379
380
381
382
383
|
// 查询客户是否存在
var customerExists = await _db.Queryable<LqKhxxEntity>().Where(c => c.Id == customerId).AnyAsync();
if (!customerExists)
{
throw NCCException.Oh("客户不存在");
}
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
384
|
// 查询开单记录数量
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
385
|
var orderCount = await _db.Queryable<LqKdKdjlbEntity>().Where(o => o.Kdhy == customerId && o.IsEffective == StatusEnum.有效.GetHashCode() && o.Sfyj > 0).CountAsync();
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
386
387
|
var hasOrderRecord = orderCount > 0;
var orderType = hasOrderRecord ? "repeat_order" : "first_order";
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
388
389
390
391
392
393
394
395
396
397
|
return new LqKhxxOrderTypeOutput
{
CustomerId = customerId,
OrderType = orderType,
HasOrderRecord = hasOrderRecord,
OrderCount = orderCount,
};
}
#endregion
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
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
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
|
#region 判断客户是否开过指定类型的开单
/// <summary>
/// 判断客户是否开过生美的开单
/// </summary>
/// <param name="memberId">会员ID</param>
/// <returns>1表示有,0表示没有</returns>
[HttpGet("has-life-beauty-billing/{memberId}")]
public async Task<int> HasLifeBeautyBilling(string memberId)
{
if (string.IsNullOrEmpty(memberId))
{
throw NCCException.Oh("会员ID不能为空");
}
// 查询该会员是否有开过生美品项的开单
var hasBilling = await _db.Queryable<LqKdKdjlbEntity>()
.InnerJoin<LqKdPxmxEntity>((kdjlb, pxmx) => kdjlb.Id == pxmx.Glkdbh)
.InnerJoin<LqXmzlEntity>((kdjlb, pxmx, xmzl) => pxmx.Px == xmzl.Id)
.Where((kdjlb, pxmx, xmzl) => kdjlb.Kdhy == memberId
&& kdjlb.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& xmzl.IsEffective == StatusEnum.有效.GetHashCode()
&& xmzl.Qt2 == "生美")
.AnyAsync();
return hasBilling ? 1 : 0;
}
/// <summary>
/// 判断客户是否开过科美的开单
/// </summary>
/// <param name="memberId">会员ID</param>
/// <returns>1表示有,0表示没有</returns>
[HttpGet("has-tech-beauty-billing/{memberId}")]
public async Task<int> HasTechBeautyBilling(string memberId)
{
if (string.IsNullOrEmpty(memberId))
{
throw NCCException.Oh("会员ID不能为空");
}
// 查询该会员是否有开过科美品项的开单
var hasBilling = await _db.Queryable<LqKdKdjlbEntity>()
.InnerJoin<LqKdPxmxEntity>((kdjlb, pxmx) => kdjlb.Id == pxmx.Glkdbh)
.InnerJoin<LqXmzlEntity>((kdjlb, pxmx, xmzl) => pxmx.Px == xmzl.Id)
.Where((kdjlb, pxmx, xmzl) => kdjlb.Kdhy == memberId
&& kdjlb.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& xmzl.IsEffective == StatusEnum.有效.GetHashCode()
&& xmzl.Qt2 == "科美")
.AnyAsync();
return hasBilling ? 1 : 0;
}
/// <summary>
/// 判断客户是否开过医美的开单
/// </summary>
/// <param name="memberId">会员ID</param>
/// <returns>1表示有,0表示没有</returns>
[HttpGet("has-medical-beauty-billing/{memberId}")]
public async Task<int> HasMedicalBeautyBilling(string memberId)
{
if (string.IsNullOrEmpty(memberId))
{
throw NCCException.Oh("会员ID不能为空");
}
// 查询该会员是否有开过医美品项的开单
var hasBilling = await _db.Queryable<LqKdKdjlbEntity>()
.InnerJoin<LqKdPxmxEntity>((kdjlb, pxmx) => kdjlb.Id == pxmx.Glkdbh)
.InnerJoin<LqXmzlEntity>((kdjlb, pxmx, xmzl) => pxmx.Px == xmzl.Id)
.Where((kdjlb, pxmx, xmzl) => kdjlb.Kdhy == memberId
&& kdjlb.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& xmzl.IsEffective == StatusEnum.有效.GetHashCode()
&& xmzl.Qt2 == "医美")
.AnyAsync();
return hasBilling ? 1 : 0;
}
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
481
|
#region 导出客户资料
|
96009bc9
hexiaodong
hxd
|
482
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
483
484
485
486
|
/// 导出客户资料
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
487
488
489
490
491
492
493
494
495
496
497
498
499
500
|
[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...
|
501
502
|
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
|
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
|
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...
|
521
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
522
523
|
return output;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
524
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
525
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
526
|
#region 批量删除客户资料
|
96009bc9
hexiaodong
hxd
|
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
|
/// <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文件,删...
|
543
|
await _db.Deleteable<LqKhxxEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
544
545
546
547
548
549
550
551
552
553
554
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1002);
}
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
555
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
556
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
557
|
#region 更新客户资料
|
96009bc9
hexiaodong
hxd
|
558
559
560
561
562
563
564
565
566
567
|
/// <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...
|
568
569
570
571
572
573
574
|
// 处理客户消费字段:将数组转换为逗号分隔的字符串
if (input.khxf != null && input.khxf.Count > 0)
{
entity.Khxf = string.Join(",", input.khxf);
}
|
96009bc9
hexiaodong
hxd
|
575
|
var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
c842ad9a
“wangming”
Remove analyze_ex...
|
576
577
|
if (!(isOk > 0))
throw NCCException.Oh(ErrorCode.COM1001);
|
96009bc9
hexiaodong
hxd
|
578
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
579
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
580
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
581
|
#region 删除客户资料
|
96009bc9
hexiaodong
hxd
|
582
583
584
585
586
587
588
589
590
591
|
/// <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...
|
592
593
|
if (!(isOk > 0))
throw NCCException.Oh(ErrorCode.COM1002);
|
96009bc9
hexiaodong
hxd
|
594
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
595
596
597
598
599
600
601
602
603
|
#endregion
#region 查询会员剩余品项
/// <summary>
/// 查询会员剩余品项信息
/// </summary>
/// <remarks>
/// 根据会员ID查询该会员的剩余品项信息,包括已购买但未消费完的品项详情
/// 支持按来源类型(F_SourceType)区分相同品项的不同来源,确保数据准确分组
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
604
|
/// 计算逻辑:剩余数量 = 购买数量 - 消费数量 - 退卡数量
|
c842ad9a
“wangming”
Remove analyze_ex...
|
605
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
606
607
608
609
|
/// 示例请求:
/// ```json
/// GET /api/Extend/LqKhxx/GetMemberRemainingItems?memberId=GK2025022100004
/// ```
|
c842ad9a
“wangming”
Remove analyze_ex...
|
610
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
611
612
|
/// 参数说明:
/// - memberId: 会员ID,必填参数
|
c842ad9a
“wangming”
Remove analyze_ex...
|
613
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
614
615
616
617
618
619
620
621
622
623
|
/// 返回数据结构:
/// - MemberId: 会员ID
/// - MemberName: 会员姓名
/// - RemainingItems: 剩余品项列表
/// - ItemId: 品项ID
/// - ItemName: 品项名称
/// - ItemPrice: 品项单价
/// - SourceType: 来源类型(用于区分相同品项的不同来源)
/// - TotalPurchased: 总购买数量
/// - ConsumedCount: 已消费数量
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
624
|
/// - RefundedCount: 已退卡数量
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
625
|
/// - RemainingCount: 剩余数量
|
c842ad9a
“wangming”
Remove analyze_ex...
|
626
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
627
628
|
/// 特殊说明:
/// - 相同品项但不同SourceType的记录会分开显示
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
629
|
/// - 耗卡和退卡统计会按品项ID和SourceType精确匹配
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
630
|
/// - 确保数据按SourceType正确分组且不重叠
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
631
|
/// - 退卡记录会减少剩余品项数量
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
632
633
634
635
636
637
638
639
640
641
642
643
644
|
/// </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不能为空");
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
645
646
|
try
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
647
|
// 1. 查询会员基本信息
|
c842ad9a
“wangming”
Remove analyze_ex...
|
648
|
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(x => x.Id == memberId).FirstAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
649
650
651
|
if (memberInfo == null)
{
_logger.LogWarning("会员不存在,会员ID:{MemberId}", memberId);
|
b45d55f7
“wangming”
Refactor LqEventS...
|
652
|
throw NCCException.Oh("会员不存在");
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
653
|
}
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
654
655
656
|
// 2. 分步查询,避免子查询问题
// 先查询基础品项数据
var baseItems = await _db.Queryable<LqKdPxmxEntity>()
|
b45d55f7
“wangming”
Refactor LqEventS...
|
657
|
.Where(x => x.MemberId == memberId)
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
658
|
.Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
659
|
.Select(x => new
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
660
|
{
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
661
662
663
664
665
|
x.Id,
x.Px,
x.Pxmc,
x.Pxjg,
x.SourceType,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
666
667
|
x.ProjectNumber,
x.Remark
|
41da4257
“wangming”
Refactor LqEventS...
|
668
|
})
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
669
670
671
672
673
|
.ToListAsync();
// 查询消费数据
var consumedData = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => baseItems.Select(b => b.Id).Contains(x.BillingItemId))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
674
|
.Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
675
676
677
678
|
.GroupBy(x => x.BillingItemId)
.Select(x => new
{
BillingItemId = x.BillingItemId,
|
a52c7842
“wangming”
更新服务类:LqKdKdjlbSe...
|
679
|
TotalConsumed = SqlFunc.AggregateSum(x.OriginalProjectNumber)
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
680
681
682
683
684
685
|
})
.ToListAsync();
// 查询退卡数据
var refundedData = await _db.Queryable<LqHytkMxEntity>()
.Where(x => baseItems.Select(b => b.Id).Contains(x.BillingItemId))
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
686
|
.Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
687
688
|
.GroupBy(x => x.BillingItemId)
.Select(x => new
|
41da4257
“wangming”
Refactor LqEventS...
|
689
|
{
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
690
691
|
BillingItemId = x.BillingItemId,
TotalRefunded = SqlFunc.AggregateSum(x.ProjectNumber)
|
b45d55f7
“wangming”
Refactor LqEventS...
|
692
693
|
})
.ToListAsync();
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
694
|
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
695
696
697
|
//查询储扣数据
var deductData = await _db.Queryable<LqKdDeductinfoEntity>()
.Where(x => baseItems.Select(b => b.Id).Contains(x.DeductId))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
698
|
.Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
699
700
701
702
|
.GroupBy(x => x.DeductId)
.Select(x => new
{
BillingItemId = x.DeductId,
|
15351286
“wangming”
fix: 修正LqKhxxServ...
|
703
|
TotalDeduct = SqlFunc.AggregateSum(x.ProjectNumber)
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
704
705
706
|
})
.ToListAsync();
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
707
708
709
710
711
712
713
714
715
|
// 组装结果
var remainingItems = baseItems.Select(item => new RemainingItemInfo
{
BillingItemId = item.Id,
ItemId = item.Px,
ItemName = item.Pxmc,
ItemPrice = item.Pxjg,
SourceType = item.SourceType,
TotalPurchased = item.ProjectNumber,
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
716
|
Remark = item.Remark,
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
717
718
|
ConsumedCount = consumedData.FirstOrDefault(c => c.BillingItemId == item.Id)?.TotalConsumed ?? 0,
RefundedCount = refundedData.FirstOrDefault(r => r.BillingItemId == item.Id)?.TotalRefunded ?? 0,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
719
|
DeductCount = deductData.FirstOrDefault(d => d.BillingItemId == item.Id)?.TotalDeduct ?? 0,
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
720
721
722
723
724
|
}).ToList();
// 计算剩余数量
foreach (var item in remainingItems)
{
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
725
|
item.RemainingCount = item.TotalPurchased - item.ConsumedCount - item.RefundedCount - item.DeductCount;
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
726
|
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
727
728
|
//过滤剩余数量为0的品项,先暂时为不等于 0 ,因为现在有问题,会出现负数,后面再修改
remainingItems = remainingItems.Where(item => item.RemainingCount != 0).ToList();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
729
730
731
732
|
return new MemberRemainingItemsOutput
{
MemberId = memberId,
MemberName = memberInfo.Khmc,
|
c842ad9a
“wangming”
Remove analyze_ex...
|
733
|
RemainingItems = remainingItems,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
734
735
736
737
738
739
740
741
742
|
};
}
catch (Exception ex)
{
_logger.LogError(ex, "查询会员剩余品项失败,会员ID:{MemberId}", memberId);
throw NCCException.Oh(ErrorCode.COM1005, "查询会员剩余品项失败");
}
}
#endregion
|
41da4257
“wangming”
Refactor LqEventS...
|
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
|
#region 获取会员类型枚举内容
/// <summary>
/// 获取会员类型枚举内容
/// </summary>
/// <returns>扣款类型枚举列表</returns>
[HttpGet("deduct-types")]
public List<EnumOutput> GetDeductTypes()
{
return Enum.GetValues<MemberTypeEnum>()
.Select(e => new EnumOutput
{
Value = (int)e,
Name = e.ToString(),
Description = e.GetDescription(),
})
.ToList();
}
#endregion
|
ed462a62
“wangming”
更新开发环境配置和优化客户信息导入功能
|
763
764
765
766
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
|
#region 导入客户信息
/// <summary>
/// 从"清理跨店的重复"表导入客户信息
/// </summary>
/// <remarks>
/// 将"清理跨店的重复"表中的数据导入到客户表中,客户类型设置为"潜客"
///
/// 导入规则:
/// 1. 根据客户电话去重,避免重复导入
/// 2. 客户类型统一设置为"潜客"
/// 3. 使用YitIdHelper生成客户ID
/// 4. 根据门店ID设置归属门店
/// 5. 根据拓客员工设置拓客人员
///
/// 字段映射:
/// - 客户姓名 -> khmc (客户名称)
/// - 客户电话 -> sjh (手机号)
/// - F_StoreId -> gsmd (归属门店)
/// - 拓客员工 -> F_ExpandUser (拓客人员)
/// - 日期 -> zcsj (注册时间)
/// </remarks>
/// <returns>导入结果</returns>
/// <response code="200">导入成功</response>
/// <response code="500">服务器内部错误</response>
[HttpPost("import-customers-from-cleanup")]
public async Task<dynamic> ImportCustomersFromCleanup()
{
try
{
_db.BeginTran();
// 1. 查询"清理跨店的重复"表数据,按客户电话去重
var cleanupData = await _db.Ado.SqlQueryAsync<dynamic>(@"
SELECT
F_Id,
客户姓名,
客户电话,
归属门店,
拓客员工,
日期,
F_StoreId,
F_UserId
FROM `清理跨店的重复`
WHERE 客户电话 IS NOT NULL
AND 客户电话 != ''
AND 客户姓名 IS NOT NULL
AND 客户姓名 != ''
GROUP BY 客户电话
ORDER BY 日期 DESC");
int successCount = 0;
int skipCount = 0;
int errorCount = 0;
var errorMessages = new List<string>();
foreach (var item in cleanupData)
{
try
{
// 2. 检查客户是否已存在(根据手机号)
string phoneNumber = (string)item.客户电话;
var existingCustomer = await _db.Queryable<LqKhxxEntity>()
.Where(x => x.Sjh == phoneNumber)
.FirstAsync();
if (existingCustomer != null)
{
skipCount++;
continue;
}
// 3. 生成客户ID
string customerId = YitIdHelper.NextId().ToString();
// 4. 创建客户实体
var customerEntity = new LqKhxxEntity
{
Id = customerId,
Khmc = (string)item.客户姓名,
Sjh = (string)item.客户电话,
Dah = $"GK{DateTime.Now:yyyyMMdd}{customerId.Substring(customerId.Length - 6)}", // 生成档案号
Xb = "未知", // 默认性别
Gsmd = (string)item.F_StoreId, // 使用门店ID
Zcsj = DateTime.TryParse((string)item.日期, out DateTime regDate) ? regDate : DateTime.Now,
Khlx = MemberTypeEnum.线索.GetHashCode().ToString(), // 客户类型设置为潜客
Jdqd = "", // 进店渠道
Lxdz = "", // 联系地址
Bz = "历史潜客导入",
CreateTime = DateTime.Now,
|
e5e15bcb
“wangming”
优化系统功能和性能
|
852
|
ExpandUser = (string)item.F_UserId, // 拓客人员
|
ed462a62
“wangming”
更新开发环境配置和优化客户信息导入功能
|
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
|
MainHealthUser = null,
SubHealthUser = null
};
// 5. 插入客户记录
await _db.Insertable(customerEntity).ExecuteCommandAsync();
successCount++;
}
catch (Exception ex)
{
errorCount++;
errorMessages.Add($"处理客户 {(string)item.客户姓名}({(string)item.客户电话}) 时出错: {ex.Message}");
}
}
_db.CommitTran();
return new
{
success = true,
message = "客户信息导入完成",
totalRecords = cleanupData.Count,
successCount = successCount,
skipCount = skipCount,
errorCount = errorCount,
errorMessages = errorMessages.Take(10).ToList(), // 只返回前10个错误信息
importTime = DateTime.Now
};
}
catch (Exception ex) when (!(ex is NCCException))
{
_db.RollbackTran();
throw NCCException.Oh($"导入客户信息失败: {ex.Message}");
}
}
#endregion
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
|
#region 获取会员品项信息
/// <summary>
/// 获取所有会员的品项信息(分页)
/// </summary>
/// <remarks>
/// 查询所有会员的品项信息,包括购买品项、赠送品项、体验品项、已消耗品项、已退卡品项、已储扣品项
///
/// 示例请求:
/// ```json
/// {
/// "currentPage": 1,
/// "pageSize": 10,
/// "MemberId": "会员ID",
/// "BelongStoreId": "所属门店ID",
/// "BillingStoreId": "开单门店ID",
/// "BillingUserId": "开单人ID",
/// "PurchaseItemId": "购买品项ID",
/// "GiftItemId": "赠送品项ID",
/// "ExperienceItemId": "体验品项ID"
/// }
/// ```
///
/// 参数说明:
/// - currentPage: 当前页码(必填)
/// - pageSize: 每页数量(必填)
/// - MemberId: 会员ID(可选)
/// - BelongStoreId: 所属门店ID(可选)
/// - BillingStoreId: 开单门店ID(可选)
/// - BillingUserId: 开单人ID(可选)
/// - PurchaseItemId: 购买品项ID(可选)
/// - GiftItemId: 赠送品项ID(可选)
/// - ExperienceItemId: 体验品项ID(可选)
///
/// 返回数据结构说明:
/// ```json
/// {
/// "pagination": {
/// "pageIndex": 1,
/// "pageSize": 10,
/// "total": 100
/// },
/// "list": [
/// {
/// "memberId": "会员ID",
/// "memberCode": "会员编号(档案号)",
/// "memberName": "会员名称",
/// "memberPhone": "会员电话",
/// "belongStoreId": "所属门店ID",
/// "belongStoreName": "所属门店名称",
/// "billingItems": [
/// {
/// "billingId": "开单ID",
/// "billingTime": "2025-11-15T10:00:00",
/// "billingStoreId": "开单门店ID",
/// "billingStoreName": "开单门店名称",
/// "billingUserId": "开单人ID",
/// "billingUserName": "开单人名称",
/// "purchaseItems": [
/// {
/// "itemId": "品项ID",
/// "itemName": "品项名称",
/// "itemPrice": 100.00,
/// "projectNumber": 5.0,
/// "totalAmount": 500.00
/// }
/// ],
/// "purchaseItemsTotalAmount": 500.00,
/// "giftItems": [
/// {
/// "itemId": "品项ID",
/// "itemName": "品项名称",
/// "itemPrice": 50.00,
/// "projectNumber": 2.0,
/// "totalAmount": 100.00
/// }
/// ],
/// "experienceItems": [
/// {
/// "itemId": "品项ID",
/// "itemName": "品项名称",
/// "itemPrice": 30.00,
/// "projectNumber": 1.0,
/// "totalAmount": 30.00
/// }
/// ],
/// "consumedItems": [
/// {
/// "itemId": "品项ID",
/// "itemName": "品项名称",
/// "itemPrice": 100.00,
/// "projectNumber": 2.0,
/// "totalAmount": 200.00
/// }
/// ],
/// "consumedItemsTotalAmount": 200.00,
/// "refundedItems": [
/// {
/// "itemId": "品项ID",
/// "itemName": "品项名称",
/// "itemPrice": 100.00,
/// "projectNumber": 1.0,
/// "totalAmount": 100.00
/// }
/// ],
/// "refundedItemsTotalAmount": 100.00,
/// "deductedItems": [
/// {
/// "itemId": "品项ID",
/// "itemName": "品项名称",
/// "itemPrice": 100.00,
/// "projectNumber": 1.0,
/// "totalAmount": 100.00
/// }
/// ],
/// "deductedItemsTotalAmount": 100.00
/// }
/// ]
/// }
/// ]
/// }
/// ```
///
/// 返回字段说明:
///
/// **分页信息 (pagination)**:
/// - pageIndex: 当前页码
/// - pageSize: 每页数量
/// - total: 总记录数
///
/// **会员信息 (list[].memberInfo)**:
/// - memberId: 会员ID
/// - memberCode: 会员编号(档案号)
/// - memberName: 会员名称
/// - memberPhone: 会员电话
/// - belongStoreId: 所属门店ID
/// - belongStoreName: 所属门店名称
///
/// **开单信息 (list[].billingItems[])**:
/// - billingId: 开单ID
/// - billingTime: 开单时间(DateTime格式)
/// - billingStoreId: 开单门店ID
/// - billingStoreName: 开单门店名称
/// - billingUserId: 开单人ID
/// - billingUserName: 开单人名称
///
/// **品项信息 (list[].billingItems[].*Items[])**:
/// - purchaseItems: 购买品项列表
/// - purchaseItemsTotalAmount: 购买品项总金额
/// - giftItems: 赠送品项列表
/// - experienceItems: 体验品项列表
/// - consumedItems: 已消耗品项列表
/// - consumedItemsTotalAmount: 已消耗品项总金额
/// - refundedItems: 已退卡品项列表
/// - refundedItemsTotalAmount: 已退卡品项总金额
/// - deductedItems: 已储扣品项列表
/// - deductedItemsTotalAmount: 已储扣品项总金额
///
/// **品项明细 (ItemDetail)**:
/// - itemId: 品项ID
/// - itemName: 品项名称
/// - itemPrice: 品项单价
/// - projectNumber: 项目次数(支持小数)
/// - totalAmount: 总金额(单价 × 次数)
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>会员品项信息列表(分页)</returns>
/// <response code="200">查询成功,返回会员品项信息列表</response>
/// <response code="400">参数错误,如页码或页大小无效</response>
/// <response code="500">服务器错误,查询过程中发生异常</response>
[HttpPost("get-member-item-info")]
public async Task<dynamic> GetMemberItemInfo([FromBody] MemberItemInfoQueryInput input)
{
try
{
// 1. 构建会员查询条件
var memberQuery = _db.Queryable<LqKhxxEntity>();
// 筛选条件
if (!string.IsNullOrEmpty(input.MemberId))
{
memberQuery = memberQuery.Where(x => x.Id == input.MemberId);
}
if (!string.IsNullOrEmpty(input.BelongStoreId))
{
memberQuery = memberQuery.Where(x => x.Gsmd == input.BelongStoreId);
}
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1079
1080
1081
1082
1083
|
if (input.MemberType >= 0)
{
memberQuery = memberQuery.Where(x => x.Khlx == input.MemberType.GetHashCode().ToString());
}
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
|
// 如果指定了开单门店、开单人、品项ID等条件,需要通过开单表进行筛选
if (!string.IsNullOrEmpty(input.BillingStoreId) ||
!string.IsNullOrEmpty(input.BillingUserId) ||
!string.IsNullOrEmpty(input.PurchaseItemId) ||
!string.IsNullOrEmpty(input.GiftItemId) ||
!string.IsNullOrEmpty(input.ExperienceItemId))
{
// 先查询符合条件的开单记录,获取会员ID列表
var billingQuery = _db.Queryable<LqKdKdjlbEntity>()
.Where(x => x.IsEffective == StatusEnum.有效.GetHashCode());
if (!string.IsNullOrEmpty(input.BillingStoreId))
{
billingQuery = billingQuery.Where(x => x.Djmd == input.BillingStoreId);
}
if (!string.IsNullOrEmpty(input.BillingUserId))
{
billingQuery = billingQuery.Where(x => x.CreateUser == input.BillingUserId);
}
// 如果指定了品项ID,需要通过品项明细表进行筛选
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1106
|
if (!string.IsNullOrEmpty(input.PurchaseItemId) || !string.IsNullOrEmpty(input.GiftItemId) || !string.IsNullOrEmpty(input.ExperienceItemId))
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
1107
|
{
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1108
|
var itemQuery = _db.Queryable<LqKdPxmxEntity>().Where(x => x.IsEffective == StatusEnum.有效.GetHashCode());
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
|
if (!string.IsNullOrEmpty(input.PurchaseItemId))
{
itemQuery = itemQuery.Where(x => x.Px == input.PurchaseItemId && x.SourceType == "购买");
}
if (!string.IsNullOrEmpty(input.GiftItemId))
{
itemQuery = itemQuery.Where(x => x.Px == input.GiftItemId && x.SourceType == "赠送");
}
if (!string.IsNullOrEmpty(input.ExperienceItemId))
{
itemQuery = itemQuery.Where(x => x.Px == input.ExperienceItemId && x.SourceType == "体验");
}
var itemBillingIds = await itemQuery.Select(x => x.Glkdbh).Distinct().ToListAsync();
if (itemBillingIds != null && itemBillingIds.Any())
{
billingQuery = billingQuery.Where(x => itemBillingIds.Contains(x.Id));
}
else
{
// 如果没有匹配的品项记录,返回空结果
return PageResult<MemberItemInfoOutput>.SqlSugarPageResult(new SqlSugarPagedList<MemberItemInfoOutput>
{
list = new List<MemberItemInfoOutput>(),
pagination = new PagedModel
{
PageIndex = input.currentPage,
PageSize = input.pageSize,
Total = 0
}
});
}
}
var memberIds = await billingQuery.Select(x => x.Kdhy).Distinct().ToListAsync();
if (memberIds != null && memberIds.Any())
{
memberQuery = memberQuery.Where(x => memberIds.Contains(x.Id));
}
else
{
// 如果没有匹配的开单记录,返回空结果
return PageResult<MemberItemInfoOutput>.SqlSugarPageResult(new SqlSugarPagedList<MemberItemInfoOutput>
{
list = new List<MemberItemInfoOutput>(),
pagination = new PagedModel
{
PageIndex = input.currentPage,
PageSize = input.pageSize,
Total = 0
}
});
}
}
// 2. 分页查询会员列表
var totalCount = await memberQuery.CountAsync();
var skipCount = (input.currentPage - 1) * input.pageSize;
var memberList = await memberQuery
.OrderBy(x => x.Id)
.Skip(skipCount)
.Take(input.pageSize)
.Select(x => new
{
x.Id,
x.Dah,
x.Khmc,
x.Sjh,
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1179
1180
|
x.Gsmd,
x.Khlx
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
|
})
.ToListAsync();
var memberData = new SqlSugarPagedList<dynamic>
{
list = memberList.Cast<dynamic>().ToList(),
pagination = new PagedModel
{
PageIndex = input.currentPage,
PageSize = input.pageSize,
Total = totalCount
}
};
if (memberList == null || !memberList.Any())
{
return PageResult<MemberItemInfoOutput>.SqlSugarPageResult(new SqlSugarPagedList<MemberItemInfoOutput>
{
list = new List<MemberItemInfoOutput>(),
pagination = new PagedModel
{
PageIndex = input.currentPage,
PageSize = input.pageSize,
Total = totalCount
}
});
}
var memberIdsList = memberList.Select(x => x.Id).ToList();
// 3. 批量查询会员的开单记录
var billingRecords = await _db.Queryable<LqKdKdjlbEntity>()
.Where(x => memberIdsList.Contains(x.Kdhy) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new
{
x.Id,
x.Kdhy,
x.Kdrq,
x.Djmd,
x.CreateUser
})
.ToListAsync();
var billingIds = billingRecords.Select(x => x.Id).ToList();
// 4. 批量查询开单的品项明细
var itemDetails = new List<dynamic>();
if (billingIds.Any())
{
var itemDetailsData = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new
{
x.Id,
x.Glkdbh,
x.Px,
x.Pxmc,
x.Pxjg,
x.SourceType,
x.ProjectNumber,
x.TotalPrice
})
.ToListAsync();
itemDetails = itemDetailsData.Cast<dynamic>().ToList();
}
var itemDetailIds = itemDetails.Select(x => (string)x.Id).ToList();
// 5. 批量查询消耗品项
var consumedItems = new List<dynamic>();
if (itemDetailIds.Any())
{
var consumedItemsData = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => itemDetailIds.Contains(x.BillingItemId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new
{
x.BillingItemId,
x.Px,
x.Pxmc,
x.Pxjg,
x.ProjectNumber,
x.TotalPrice
})
.ToListAsync();
consumedItems = consumedItemsData.Cast<dynamic>().ToList();
}
// 6. 批量查询退卡品项
var refundedItems = new List<dynamic>();
if (itemDetailIds.Any())
{
var refundedItemsData = await _db.Queryable<LqHytkMxEntity>()
.Where(x => itemDetailIds.Contains(x.BillingItemId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new
{
x.BillingItemId,
x.Px,
x.Pxmc,
x.Pxjg,
x.ProjectNumber,
x.Tkje
})
.ToListAsync();
refundedItems = refundedItemsData.Cast<dynamic>().ToList();
}
// 7. 批量查询储扣品项
var deductedItems = new List<dynamic>();
if (billingIds.Any())
{
var deductedItemsData = await _db.Queryable<LqKdDeductinfoEntity>()
.Where(x => billingIds.Contains(x.BillingId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new
{
x.BillingId,
x.ItemId,
x.ItemName,
x.UnitPrice,
x.ProjectNumber,
x.Amount
})
.ToListAsync();
deductedItems = deductedItemsData.Cast<dynamic>().ToList();
}
// 8. 批量查询门店信息
var storeIds = new List<string>();
if (memberList != null && memberList.Any())
{
storeIds.AddRange(memberList.Select(x => x.Gsmd).Where(x => !string.IsNullOrEmpty(x)));
}
if (billingRecords != null && billingRecords.Any())
{
storeIds.AddRange(billingRecords.Select(x => x.Djmd).Where(x => !string.IsNullOrEmpty(x)));
}
storeIds = storeIds.Distinct().ToList();
var stores = new Dictionary<string, string>();
if (storeIds.Any())
{
var storeList = await _db.Queryable<LqMdxxEntity>()
.Where(x => storeIds.Contains(x.Id))
.Select(x => new { x.Id, x.Dm })
.ToListAsync();
stores = storeList.ToDictionary(x => x.Id, x => x.Dm ?? "");
}
// 9. 批量查询用户信息
var userIds = new List<string>();
if (billingRecords != null && billingRecords.Any())
{
userIds = billingRecords.Select(x => x.CreateUser)
.Where(x => !string.IsNullOrEmpty(x))
.Distinct()
.ToList();
}
var users = new Dictionary<string, string>();
if (userIds.Any())
{
var userList = await _db.Queryable<UserEntity>()
.Where(x => userIds.Contains(x.Id))
.Select(x => new { x.Id, x.RealName })
.ToListAsync();
users = userList.ToDictionary(x => x.Id, x => x.RealName ?? "");
}
// 10. 组装数据
var result = new List<MemberItemInfoOutput>();
foreach (var member in memberList)
{
var memberOutput = new MemberItemInfoOutput
{
MemberId = member.Id,
MemberCode = member.Dah ?? "",
MemberName = member.Khmc ?? "",
MemberPhone = member.Sjh ?? "",
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1361
|
MemberType = member.Khlx.ToInt(),
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
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
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
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
|
BelongStoreId = member.Gsmd ?? "",
BelongStoreName = stores.ContainsKey(member.Gsmd ?? "") ? stores[member.Gsmd] : ""
};
// 获取该会员的所有开单
var memberBillings = billingRecords.Where(x => x.Kdhy == member.Id).ToList();
foreach (var billing in memberBillings)
{
var billingItem = new BillingItemInfo
{
BillingId = billing.Id,
BillingTime = billing.Kdrq,
BillingStoreId = billing.Djmd ?? "",
BillingStoreName = stores.ContainsKey(billing.Djmd ?? "") ? stores[billing.Djmd] : "",
BillingUserId = billing.CreateUser ?? "",
BillingUserName = users.ContainsKey(billing.CreateUser ?? "") ? users[billing.CreateUser] : ""
};
// 获取该开单的所有品项明细
var billingItemDetails = itemDetails.Where(x =>
{
try
{
return x.Glkdbh?.ToString() == billing.Id;
}
catch
{
return false;
}
}).ToList();
// 分类品项
foreach (var item in billingItemDetails)
{
try
{
var itemDetail = new ItemDetail
{
ItemId = item.Px?.ToString() ?? "",
ItemName = item.Pxmc?.ToString() ?? "",
ItemPrice = Convert.ToDecimal(item.Pxjg ?? 0),
ProjectNumber = Convert.ToDecimal(item.ProjectNumber ?? 0),
TotalAmount = Convert.ToDecimal(item.TotalPrice ?? 0)
};
var sourceType = item.SourceType?.ToString() ?? "";
if (sourceType == "购买")
{
billingItem.PurchaseItems.Add(itemDetail);
billingItem.PurchaseItemsTotalAmount += itemDetail.TotalAmount;
}
else if (sourceType == "赠送")
{
billingItem.GiftItems.Add(itemDetail);
}
else if (sourceType == "体验")
{
billingItem.ExperienceItems.Add(itemDetail);
}
}
catch (Exception ex)
{
_logger.LogWarning(ex, "处理品项明细时出错,开单ID:{BillingId}", billing.Id);
}
}
// 获取消耗品项
var billingItemIds = billingItemDetails.Select(x =>
{
try
{
return x.Id?.ToString() ?? "";
}
catch
{
return "";
}
}).Where(x => !string.IsNullOrEmpty(x)).ToList();
var consumed = consumedItems.Where(x =>
{
try
{
return billingItemIds.Contains(x.BillingItemId?.ToString() ?? "");
}
catch
{
return false;
}
}).ToList();
foreach (var consumedItem in consumed)
{
try
{
billingItem.ConsumedItems.Add(new ItemDetail
{
ItemId = consumedItem.Px?.ToString() ?? "",
ItemName = consumedItem.Pxmc?.ToString() ?? "",
ItemPrice = Convert.ToDecimal(consumedItem.Pxjg ?? 0),
ProjectNumber = Convert.ToDecimal(consumedItem.ProjectNumber ?? 0),
TotalAmount = Convert.ToDecimal(consumedItem.TotalPrice ?? 0)
});
billingItem.ConsumedItemsTotalAmount += Convert.ToDecimal(consumedItem.TotalPrice ?? 0);
}
catch (Exception ex)
{
_logger.LogWarning(ex, "处理消耗品项时出错");
}
}
// 获取退卡品项
var refunded = refundedItems.Where(x =>
{
try
{
return billingItemIds.Contains(x.BillingItemId?.ToString() ?? "");
}
catch
{
return false;
}
}).ToList();
foreach (var refundedItem in refunded)
{
try
{
billingItem.RefundedItems.Add(new ItemDetail
{
ItemId = refundedItem.Px?.ToString() ?? "",
ItemName = refundedItem.Pxmc?.ToString() ?? "",
ItemPrice = Convert.ToDecimal(refundedItem.Pxjg ?? 0),
ProjectNumber = Convert.ToDecimal(refundedItem.ProjectNumber ?? 0),
TotalAmount = Convert.ToDecimal(refundedItem.Tkje ?? 0)
});
billingItem.RefundedItemsTotalAmount += Convert.ToDecimal(refundedItem.Tkje ?? 0);
}
catch (Exception ex)
{
_logger.LogWarning(ex, "处理退卡品项时出错");
}
}
// 获取储扣品项
var deducted = deductedItems.Where(x =>
{
try
{
return x.BillingId?.ToString() == billing.Id;
}
catch
{
return false;
}
}).ToList();
foreach (var deductedItem in deducted)
{
try
{
billingItem.DeductedItems.Add(new ItemDetail
{
ItemId = deductedItem.ItemId?.ToString() ?? "",
ItemName = deductedItem.ItemName?.ToString() ?? "",
ItemPrice = Convert.ToDecimal(deductedItem.UnitPrice ?? 0),
ProjectNumber = Convert.ToDecimal(deductedItem.ProjectNumber ?? 0),
TotalAmount = Convert.ToDecimal(deductedItem.Amount ?? 0)
});
billingItem.DeductedItemsTotalAmount += Convert.ToDecimal(deductedItem.Amount ?? 0);
}
catch (Exception ex)
{
_logger.LogWarning(ex, "处理储扣品项时出错");
}
}
memberOutput.BillingItems.Add(billingItem);
}
result.Add(memberOutput);
}
return PageResult<MemberItemInfoOutput>.SqlSugarPageResult(new SqlSugarPagedList<MemberItemInfoOutput>
{
list = result,
pagination = new PagedModel
{
PageIndex = input.currentPage,
PageSize = input.pageSize,
Total = totalCount
}
});
}
catch (Exception ex)
{
_logger.LogError(ex, "查询会员品项信息失败,异常详情:{ExceptionDetail}", ex.ToString());
throw NCCException.Oh(ErrorCode.COM1005, $"查询会员品项信息失败: {ex.Message}");
}
}
#endregion
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
|
#region 会员信息更新
/// <summary>
/// 更新会员信息(单个会员)
/// </summary>
/// <param name="memberId">会员ID</param>
/// <returns></returns>
[HttpPost("UpdateMemberInfo")]
public async Task<dynamic> UpdateMemberInfo([FromBody] string memberId)
{
try
{
if (string.IsNullOrEmpty(memberId))
{
throw NCCException.Oh("会员ID不能为空");
}
var member = await _db.Queryable<LqKhxxEntity>()
.Where(x => x.Id == memberId && x.IsEffective == StatusEnum.有效.GetHashCode())
.FirstAsync();
if (member == null)
{
throw NCCException.Oh("会员不存在");
}
await UpdateMemberInfoInternal(member);
return new { success = true, message = "更新成功" };
}
catch (Exception ex)
{
_logger.LogError(ex, "更新会员信息失败,会员ID:{MemberId}", memberId);
throw NCCException.Oh($"更新会员信息失败:{ex.Message}");
}
}
/// <summary>
|
28b8ebfb
“wangming”
feat: 添加业绩表品项分类和品...
|
1602
|
/// 批量更新所有会员信息(高性能版:使用SQL批量更新)【通过定时任务去执行,每天晚上执行一次】
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
|
/// </summary>
/// <returns></returns>
[HttpPost("BatchUpdateMemberInfo")]
[AllowAnonymous]
public async Task<dynamic> BatchUpdateMemberInfo()
{
try
{
var startTime = DateTime.Now;
_logger.LogInformation("开始批量更新会员信息(高性能SQL版)");
// 1. 获取所有有效会员ID
var memberIds = await _db.Queryable<LqKhxxEntity>()
.Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => x.Id)
.ToListAsync();
var totalCount = memberIds.Count;
if (totalCount == 0)
{
return new
{
success = true,
totalCount = 0,
successCount = 0,
failCount = 0,
duration = "0秒"
};
}
_logger.LogInformation("开始使用SQL批量更新,会员总数:{Total}", totalCount);
var sqlStartTime = DateTime.Now;
// 使用原生SQL一次性更新所有会员信息
var beautyThreshold = MemberInfoUpdateConfig.BeautyMemberAmountThreshold;
var medicalThreshold = MemberInfoUpdateConfig.MedicalMemberAmountThreshold;
var techThreshold = MemberInfoUpdateConfig.TechMemberAmountThreshold;
var minSleepThreshold = MemberInfoUpdateConfig.SleepDaysThresholds.Min();
var now = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
b26a469f
“wangming”
feat: 添加耗卡品项明细查询接...
|
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
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
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
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
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
1861
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
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
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
|
// 构建SQL更新语句
var updateSql = $@"
UPDATE lq_khxx kh
LEFT JOIN (
-- 生美会员判断
SELECT
pxmx.F_MemberId as MemberId,
CASE WHEN SUM(CASE WHEN pxmx.F_ItemCategory = '生美' THEN pxmx.F_ActualPrice ELSE 0 END) > {beautyThreshold} THEN 1 ELSE 0 END as IsBeautyMember,
MIN(CASE WHEN pxmx.F_ItemCategory = '生美' AND kd.kdrq IS NOT NULL THEN kd.kdrq ELSE NULL END) as BeautyMemberTime
FROM lq_kd_pxmx pxmx
INNER JOIN lq_kd_kdjlb kd ON pxmx.glkdbh = kd.F_Id
WHERE pxmx.F_IsEffective = 1
AND kd.F_IsEffective = 1
AND pxmx.F_ActualPrice > 0
AND pxmx.px != '61'
GROUP BY pxmx.F_MemberId
) beauty ON kh.F_Id = beauty.MemberId
LEFT JOIN (
-- 医美会员判断
SELECT
pxmx.F_MemberId as MemberId,
CASE WHEN SUM(CASE WHEN pxmx.F_ItemCategory = '医美' THEN pxmx.F_ActualPrice ELSE 0 END) > {medicalThreshold} THEN 1 ELSE 0 END as IsMedicalMember,
MIN(CASE WHEN pxmx.F_ItemCategory = '医美' AND kd.kdrq IS NOT NULL THEN kd.kdrq ELSE NULL END) as MedicalMemberTime
FROM lq_kd_pxmx pxmx
INNER JOIN lq_kd_kdjlb kd ON pxmx.glkdbh = kd.F_Id
WHERE pxmx.F_IsEffective = 1
AND kd.F_IsEffective = 1
AND pxmx.F_ActualPrice > 0
AND pxmx.px != '61'
GROUP BY pxmx.F_MemberId
) medical ON kh.F_Id = medical.MemberId
LEFT JOIN (
-- 科技部会员判断
SELECT
pxmx.F_MemberId as MemberId,
CASE WHEN MAX(CASE WHEN pxmx.F_ItemCategory = '科美' AND pxmx.F_ActualPrice >= {techThreshold} THEN 1 ELSE 0 END) = 1 THEN 1 ELSE 0 END as IsTechMember,
MIN(CASE WHEN pxmx.F_ItemCategory = '科美' AND pxmx.F_ActualPrice >= {techThreshold} AND kd.kdrq IS NOT NULL THEN kd.kdrq ELSE NULL END) as TechMemberTime
FROM lq_kd_pxmx pxmx
INNER JOIN lq_kd_kdjlb kd ON pxmx.glkdbh = kd.F_Id
WHERE pxmx.F_IsEffective = 1
AND kd.F_IsEffective = 1
AND pxmx.F_ActualPrice > 0
AND pxmx.px != '61'
GROUP BY pxmx.F_MemberId
) tech ON kh.F_Id = tech.MemberId
LEFT JOIN (
-- 到店天数、首次到店时间、最后到店时间
SELECT
xh.hy as MemberId,
COUNT(DISTINCT DATE(xh.hksj)) as VisitDays,
MIN(xh.hksj) as FirstVisitTime,
MAX(xh.hksj) as LastVisitTime
FROM lq_xh_hyhk xh
WHERE xh.F_IsEffective = 1
GROUP BY xh.hy
) visit ON kh.F_Id = visit.MemberId
LEFT JOIN (
-- 开卡总金额
SELECT
kd.kdhy as MemberId,
COALESCE(SUM(kd.sfyj), 0) as TotalBillingAmount
FROM lq_kd_kdjlb kd
WHERE kd.F_IsEffective = 1
GROUP BY kd.kdhy
) billing ON kh.F_Id = billing.MemberId
LEFT JOIN (
-- 耗卡总金额
SELECT
xh.hy as MemberId,
COALESCE(SUM(xh.xfje), 0) as TotalConsumeAmount
FROM lq_xh_hyhk xh
WHERE xh.F_IsEffective = 1
GROUP BY xh.hy
) consume ON kh.F_Id = consume.MemberId
LEFT JOIN (
-- 退款总金额
SELECT
tk.hy as MemberId,
COALESCE(SUM(tk.F_ActualRefundAmount), 0) as TotalRefundAmount
FROM lq_hytk_hytk tk
WHERE tk.F_IsEffective = 1
GROUP BY tk.hy
) refund ON kh.F_Id = refund.MemberId
SET
kh.F_IsBeautyMember = COALESCE(beauty.IsBeautyMember, 0),
kh.F_IsMedicalMember = COALESCE(medical.IsMedicalMember, 0),
kh.F_IsTechMember = COALESCE(tech.IsTechMember, 0),
kh.F_BeautyMemberTime = CASE WHEN kh.F_BeautyMemberTime IS NULL THEN beauty.BeautyMemberTime ELSE kh.F_BeautyMemberTime END,
kh.F_MedicalMemberTime = CASE WHEN kh.F_MedicalMemberTime IS NULL THEN medical.MedicalMemberTime ELSE kh.F_MedicalMemberTime END,
kh.F_TechMemberTime = CASE WHEN kh.F_TechMemberTime IS NULL THEN tech.TechMemberTime ELSE kh.F_TechMemberTime END,
kh.F_FirstVisitTime = visit.FirstVisitTime,
kh.F_LastVisitTime = visit.LastVisitTime,
kh.F_VisitDays = COALESCE(visit.VisitDays, 0),
kh.F_TotalBillingAmount = COALESCE(billing.TotalBillingAmount, 0),
kh.F_TotalConsumeAmount = COALESCE(consume.TotalConsumeAmount, 0),
kh.F_RemainingRightsAmount = GREATEST(0, COALESCE(billing.TotalBillingAmount, 0) - COALESCE(consume.TotalConsumeAmount, 0) - COALESCE(refund.TotalRefundAmount, 0)),
kh.F_SleepDays = GREATEST(0, DATEDIFF(CURDATE(), COALESCE(kh.F_LastConsumeTime, visit.LastVisitTime, kh.F_CreateTime))),
kh.F_SleepStartTime = CASE
WHEN DATEDIFF(CURDATE(), COALESCE(kh.F_LastConsumeTime, visit.LastVisitTime, kh.F_CreateTime)) >= {minSleepThreshold}
AND kh.F_SleepStartTime IS NULL
THEN DATE(COALESCE(kh.F_LastConsumeTime, visit.LastVisitTime, kh.F_CreateTime))
WHEN DATEDIFF(CURDATE(), COALESCE(kh.F_LastConsumeTime, visit.LastVisitTime, kh.F_CreateTime)) < {minSleepThreshold}
THEN NULL
ELSE kh.F_SleepStartTime
END,
kh.F_ConsumeLevel = CASE
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 200000 THEN 5
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 100000 THEN 4
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 50000 THEN 3
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 30000 THEN 2
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 10000 THEN 1
ELSE 0
END,
kh.F_ConsumeLevelUpdateTime = CASE
WHEN kh.F_ConsumeLevel != CASE
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 200000 THEN 5
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 100000 THEN 4
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 50000 THEN 3
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 30000 THEN 2
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 10000 THEN 1
ELSE 0
END THEN NOW()
WHEN kh.F_ConsumeLevelUpdateTime IS NULL AND CASE
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 200000 THEN 5
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 100000 THEN 4
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 50000 THEN 3
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 30000 THEN 2
WHEN COALESCE(consume.TotalConsumeAmount, 0) >= 10000 THEN 1
ELSE 0
END > 0 THEN NOW()
ELSE kh.F_ConsumeLevelUpdateTime
END
WHERE kh.F_IsEffective = 1";
var affectedRows = await _db.Ado.ExecuteCommandAsync(updateSql);
var sqlEndTime = DateTime.Now;
var duration = (sqlEndTime - sqlStartTime).TotalSeconds;
_logger.LogInformation("SQL批量更新完成,影响行数:{Rows},耗时:{Duration}秒", affectedRows, duration);
var endTime = DateTime.Now;
var totalDuration = (endTime - startTime).TotalSeconds;
_logger.LogInformation("批量更新会员信息完成,总数量:{Total},影响行数:{Rows},耗时:{Duration}秒",
totalCount, affectedRows, totalDuration);
return new
{
success = true,
totalCount = totalCount,
successCount = affectedRows,
failCount = totalCount - affectedRows,
duration = $"{totalDuration:F2}秒",
sqlDuration = $"{duration:F2}秒"
};
}
catch (Exception ex)
{
_logger.LogError(ex, "批量更新会员信息失败");
throw NCCException.Oh($"批量更新会员信息失败:{ex.Message}");
}
}
/// <summary>
/// 更新会员信息内部方法
/// </summary>
/// <param name="member">会员实体</param>
private async Task UpdateMemberInfoInternal(LqKhxxEntity member)
{
// 1. 判断生美/医美/科技部会员
await UpdateMemberTypeFlags(member);
// 2. 计算到店天数
await UpdateVisitDays(member);
// 3. 计算沉睡天数
await UpdateSleepDays(member);
// 4. 计算消费金额和等级
await UpdateConsumeInfo(member);
// 5. 更新到数据库
await _db.Updateable(member)
.UpdateColumns(x => new
{
x.IsBeautyMember,
x.IsMedicalMember,
x.IsTechMember,
x.BeautyMemberTime,
x.MedicalMemberTime,
x.TechMemberTime,
x.FirstVisitTime,
x.LastVisitTime,
x.VisitDays,
x.SleepStartTime,
x.SleepDays,
x.TotalConsumeAmount,
x.TotalBillingAmount,
x.RemainingRightsAmount,
x.ConsumeLevel,
x.ConsumeLevelUpdateTime
})
.ExecuteCommandAsync();
}
/// <summary>
/// 更新会员类型标识(生美/医美/科技部会员)
/// </summary>
private async Task UpdateMemberTypeFlags(LqKhxxEntity member)
{
// 查询该会员的所有有效开单品项明细
var billingItems = await _db.Queryable<LqKdPxmxEntity>()
.InnerJoin<LqKdKdjlbEntity>((pxmx, kd) => pxmx.Glkdbh == kd.Id)
.Where((pxmx, kd) =>
pxmx.MemberId == member.Id
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& kd.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.ActualPrice > 0
&& pxmx.Px != "61") // 排除女神卡
.Select((pxmx, kd) => new
{
pxmx.ItemCategory,
pxmx.ActualPrice,
pxmx.Pxjg,
kd.Kdrq
})
.ToListAsync();
// 判断生美会员:开卡品项为生美并且金额大于阈值
var beautyAmount = billingItems
.Where(x => x.ItemCategory == "生美")
.Sum(x => x.ActualPrice);
if (beautyAmount > MemberInfoUpdateConfig.BeautyMemberAmountThreshold)
{
member.IsBeautyMember = 1;
if (!member.BeautyMemberTime.HasValue)
{
var firstBeautyBilling = billingItems
.Where(x => x.ItemCategory == "生美")
.OrderBy(x => x.Kdrq)
.FirstOrDefault();
member.BeautyMemberTime = firstBeautyBilling?.Kdrq;
}
}
else
{
member.IsBeautyMember = 0;
member.BeautyMemberTime = null;
}
// 判断医美会员:开卡品项为医美并且金额大于阈值
var medicalAmount = billingItems
.Where(x => x.ItemCategory == "医美")
.Sum(x => x.ActualPrice);
if (medicalAmount > MemberInfoUpdateConfig.MedicalMemberAmountThreshold)
{
member.IsMedicalMember = 1;
if (!member.MedicalMemberTime.HasValue)
{
var firstMedicalBilling = billingItems
.Where(x => x.ItemCategory == "医美")
.OrderBy(x => x.Kdrq)
.FirstOrDefault();
member.MedicalMemberTime = firstMedicalBilling?.Kdrq;
}
}
else
{
member.IsMedicalMember = 0;
member.MedicalMemberTime = null;
}
// 判断科技部会员:科美单品项金额大于等于阈值
var hasTechMember = billingItems
.Where(x => x.ItemCategory == "科美")
.Any(x => x.ActualPrice >= MemberInfoUpdateConfig.TechMemberAmountThreshold);
if (hasTechMember)
{
member.IsTechMember = 1;
if (!member.TechMemberTime.HasValue)
{
var firstTechBilling = billingItems
.Where(x => x.ItemCategory == "科美" && x.ActualPrice >= MemberInfoUpdateConfig.TechMemberAmountThreshold)
.OrderBy(x => x.Kdrq)
.FirstOrDefault();
member.TechMemberTime = firstTechBilling?.Kdrq;
}
}
else
{
member.IsTechMember = 0;
member.TechMemberTime = null;
}
}
/// <summary>
/// 更新到店天数
/// </summary>
private async Task UpdateVisitDays(LqKhxxEntity member)
{
// 查询该会员的所有有效耗卡记录,按天去重
var visitDates = await _db.Queryable<LqXhHyhkEntity>()
.Where(x =>
x.Hy == member.Id
&& x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new
{
VisitDate = SqlFunc.ToDate(x.Hksj)
})
.Distinct()
.ToListAsync();
member.VisitDays = visitDates.Count;
// 更新首次到店时间和最后到店时间
if (visitDates.Any())
{
var firstVisit = await _db.Queryable<LqXhHyhkEntity>()
.Where(x => x.Hy == member.Id && x.IsEffective == StatusEnum.有效.GetHashCode())
.OrderBy(x => x.Hksj)
.Select(x => x.Hksj)
.FirstAsync();
member.FirstVisitTime = firstVisit;
var lastVisit = await _db.Queryable<LqXhHyhkEntity>()
.Where(x => x.Hy == member.Id && x.IsEffective == StatusEnum.有效.GetHashCode())
.OrderBy(x => x.Hksj, OrderByType.Desc)
.Select(x => x.Hksj)
.FirstAsync();
member.LastVisitTime = lastVisit;
}
else
{
member.FirstVisitTime = null;
member.LastVisitTime = null;
}
}
/// <summary>
/// 更新沉睡天数
/// </summary>
private Task UpdateSleepDays(LqKhxxEntity member)
{
var now = DateTime.Now;
var lastConsumeTime = member.LastConsumeTime;
if (!lastConsumeTime.HasValue)
{
// 如果没有最后消费时间,使用最后到店时间
lastConsumeTime = member.LastVisitTime;
}
if (lastConsumeTime.HasValue)
{
var daysSinceLastConsume = (now.Date - lastConsumeTime.Value.Date).Days;
member.SleepDays = Math.Max(0, daysSinceLastConsume);
// 如果超过最小沉睡阈值,设置沉睡开始时间
var minSleepThreshold = MemberInfoUpdateConfig.SleepDaysThresholds.Min();
if (member.SleepDays >= minSleepThreshold)
{
if (!member.SleepStartTime.HasValue)
{
member.SleepStartTime = lastConsumeTime.Value.Date;
}
}
else
{
member.SleepStartTime = null;
}
}
else
{
member.SleepDays = 0;
member.SleepStartTime = null;
}
return Task.CompletedTask;
}
/// <summary>
/// 更新消费信息(开卡总金额、耗卡总金额、剩余权益总金额、消费等级)
/// </summary>
private async Task UpdateConsumeInfo(LqKhxxEntity member)
{
// 1. 计算开卡总金额(累计所有开单的实付业绩总和)
var totalBillingAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(x => x.Kdhy == member.Id && x.IsEffective == StatusEnum.有效.GetHashCode()).SumAsync(x => (decimal?)x.Sfyj) ?? 0m;
member.TotalBillingAmount = totalBillingAmount;
// 2. 计算耗卡总金额(累计所有耗卡的金额总和)
var totalConsumeAmount = await _db.Queryable<LqXhHyhkEntity>().Where(x => x.Hy == member.Id && x.IsEffective == StatusEnum.有效.GetHashCode()).SumAsync(x => (decimal?)x.Xfje) ?? 0m;
member.TotalConsumeAmount = totalConsumeAmount;
// 3. 计算退款总金额
var totalRefundAmount = await _db.Queryable<LqHytkHytkEntity>().Where(x => x.Hy == member.Id && x.IsEffective == StatusEnum.有效.GetHashCode()).SumAsync(x => (decimal?)x.ActualRefundAmount) ?? 0m;
// 4. 计算剩余权益总金额
member.RemainingRightsAmount = totalBillingAmount - totalConsumeAmount - totalRefundAmount;
if (member.RemainingRightsAmount < 0)
{
member.RemainingRightsAmount = 0m;
}
// 5. 计算消费等级(根据耗卡总金额)
var oldLevel = member.ConsumeLevel;
member.ConsumeLevel = MemberInfoUpdateConfig.GetConsumeLevel(totalConsumeAmount);
// 如果等级发生变化,更新等级更新时间
if (oldLevel != member.ConsumeLevel)
{
member.ConsumeLevelUpdateTime = DateTime.Now;
}
else if (!member.ConsumeLevelUpdateTime.HasValue && member.ConsumeLevel > 0)
{
// 如果之前没有等级更新时间,但当前有等级,设置当前时间
member.ConsumeLevelUpdateTime = DateTime.Now;
}
}
#endregion
|
96009bc9
hexiaodong
hxd
|
2066
2067
|
}
}
|