00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1
2
3
4
5
6
7
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
8
|
using Microsoft.Extensions.Logging;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
9
10
11
|
using NCC.ClayObject;
using NCC.Common.Configuration;
using NCC.Common.Core.Manager;
|
96009bc9
hexiaodong
hxd
|
12
13
14
|
using NCC.Common.Enum;
using NCC.Common.Extension;
using NCC.Common.Filter;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
15
16
17
|
using NCC.Common.Helper;
using NCC.Common.Model.NPOI;
using NCC.DataEncryption;
|
96009bc9
hexiaodong
hxd
|
18
19
|
using NCC.Dependency;
using NCC.DynamicApiController;
|
b45d55f7
“wangming”
Refactor LqEventS...
|
20
|
using NCC.Extend.Entitys.Dto.Common;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
21
|
using NCC.Extend.Entitys.Dto.LqKdDeductinfo;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
22
|
using NCC.Extend.Entitys.Dto.LqKdKdjlb;
|
b45d55f7
“wangming”
Refactor LqEventS...
|
23
|
using NCC.Extend.Entitys.Enum;
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
24
|
using NCC.Extend.Entitys.lq_hytk_hytk;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
25
|
using NCC.Extend.Entitys.lq_hytk_mx;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
26
27
|
using NCC.Extend.Entitys.lq_hytk_jksyj;
using NCC.Extend.Entitys.lq_hytk_kjbsyj;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
28
|
using NCC.Extend.Entitys.lq_jinsanjiao_user;
|
b45d55f7
“wangming”
Refactor LqEventS...
|
29
|
using NCC.Extend.Entitys.lq_kd_deductinfo;
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
30
31
|
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_pxmx;
|
efde7d04
“wangming”
更新多个文件,删除不再使用的CSS...
|
32
|
using NCC.Extend.Entitys.lq_kd_jksyj;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
33
|
using NCC.Extend.Entitys.lq_kd_kdjlb;
|
efde7d04
“wangming”
更新多个文件,删除不再使用的CSS...
|
34
35
|
using NCC.Extend.Entitys.lq_kd_kjbsyj;
using NCC.Extend.Entitys.lq_kd_pxmx;
|
41da4257
“wangming”
Refactor LqEventS...
|
36
|
using NCC.Extend.Entitys.lq_khxx;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
37
38
|
using NCC.Extend.Entitys.lq_xmzl;
using NCC.Extend.Interfaces.LqKdKdjlb;
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
39
|
using NCC.Extend.Utils;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
40
41
|
using NCC.FriendlyException;
using NCC.JsonSerialization;
|
06553fb7
“wangming”
1
|
42
|
using NCC.System.Entitys.Permission;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
43
44
|
using SqlSugar;
using Yitter.IdGenerator;
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
45
|
using NCC.Extend.Entitys.lq_package_info;
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
46
|
using NCC.Extend.Entitys.lq_mdxx;
|
5b462535
“wangming”
1111
|
47
|
using NCC.Extend.Entitys.lq_card_transfer_log;
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
48
|
using NCC.Extend.Entitys.Dto.LqDailyReport;
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
49
|
using NCC.Extend.Entitys.lq_yyjl;
|
96009bc9
hexiaodong
hxd
|
50
51
52
53
54
55
|
namespace NCC.Extend.LqKdKdjlb
{
/// <summary>
/// 开单记录表服务
/// </summary>
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
56
|
[ApiDescriptionSettings(Tag = "绿纤开单记录表服务", Name = "LqKdKdjlb", Order = 200)]
|
96009bc9
hexiaodong
hxd
|
57
58
59
60
61
62
63
64
65
|
[Route("api/Extend/[controller]")]
public class LqKdKdjlbService : ILqKdKdjlbService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<LqKdKdjlbEntity> _lqKdKdjlbRepository;
private readonly ISqlSugarRepository<LqKdJksyjEntity> _lqKdJksyjRepository;
private readonly ISqlSugarRepository<LqKdKjbsyjEntity> _lqKdKjbsyjRepository;
private readonly ISqlSugarRepository<LqKdPxmxEntity> _lqKdPxmxRepository;
private readonly SqlSugarScope _db;
private readonly IUserManager _userManager;
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
66
67
|
private readonly WeChatBotService _weChatBotService;
private readonly LqKdKdjlbStringGenerator _stringGenerator;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
68
|
private readonly ILogger<LqKdKdjlbService> _logger;
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
69
|
private readonly LqDailyReportService _dailyReportService;
|
96009bc9
hexiaodong
hxd
|
70
71
72
73
74
75
76
77
78
|
/// <summary>
/// 初始化一个<see cref="LqKdKdjlbService"/>类型的新实例
/// </summary>
public LqKdKdjlbService(
ISqlSugarRepository<LqKdKdjlbEntity> lqKdKdjlbRepository,
ISqlSugarRepository<LqKdJksyjEntity> lqKdJksyjRepository,
ISqlSugarRepository<LqKdKjbsyjEntity> lqKdKjbsyjRepository,
ISqlSugarRepository<LqKdPxmxEntity> lqKdPxmxRepository,
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
79
80
|
IUserManager userManager,
WeChatBotService weChatBotService,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
81
|
LqKdKdjlbStringGenerator stringGenerator,
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
82
83
|
ILogger<LqKdKdjlbService> logger,
LqDailyReportService dailyReportService
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
84
|
)
|
96009bc9
hexiaodong
hxd
|
85
|
{
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
86
|
_lqKdKdjlbRepository = lqKdKdjlbRepository;
|
96009bc9
hexiaodong
hxd
|
87
88
89
90
91
|
_db = _lqKdKdjlbRepository.Context;
_lqKdJksyjRepository = lqKdJksyjRepository;
_lqKdKjbsyjRepository = lqKdKjbsyjRepository;
_lqKdPxmxRepository = lqKdPxmxRepository;
_userManager = userManager;
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
92
93
|
_weChatBotService = weChatBotService;
_stringGenerator = stringGenerator;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
94
|
_logger = logger;
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
95
|
_dailyReportService = dailyReportService;
|
96009bc9
hexiaodong
hxd
|
96
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
97
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
98
|
#region 获取开单记录表
|
96009bc9
hexiaodong
hxd
|
99
100
101
|
/// <summary>
/// 获取开单记录表
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
102
103
104
|
/// <remarks>
/// 获取开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 按照开单的完整格式返回数据,不包含汇总信息
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
105
|
///
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
106
107
108
109
110
111
112
113
114
115
116
|
/// 返回数据结构:
/// - 主表信息:开单基础信息、业绩信息、支付信息、会员信息等
/// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
/// - 健康师业绩列表:按品项关联的健康师业绩信息
/// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <returns>开单记录完整信息</returns>
/// <response code="200">查询成功</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
117
118
119
|
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
120
121
122
123
124
125
126
127
|
try
{
// 1. 查询主表信息
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "开单记录不存在");
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
128
|
var output = entity.Adapt<LqKdKdjlbInfoOutput>();
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
129
130
131
132
|
if (!string.IsNullOrEmpty(entity.AppointmentId))
{
output.appointmentTime = await _db.Queryable<LqYyjlEntity>().Where(x => x.Id == entity.AppointmentId).Select(x => x.Yysj).FirstAsync();
}
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
133
134
135
136
|
if (output.activityId != null)
{
output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
}
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
137
138
139
140
|
//获取会员信息
var MemberInfo = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == entity.Kdhy);
output.kdhyc = MemberInfo.Khmc;
output.kdhysjh = MemberInfo.Sjh;
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
141
|
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
142
143
144
145
|
if (!string.IsNullOrEmpty(entity.ActivityId))
{
output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
146
|
// 2. 查询品项明细列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
147
|
var lqKdPxmxList = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
148
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
149
|
// 3. 查询健康师业绩列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
150
|
var lqKdJksyjList = await _db.Queryable<LqKdJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
151
152
|
// 4. 查询科技部老师业绩列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
153
|
var lqKdKjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
154
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
155
156
157
|
// 5. 查询扣款信息列表
var lqKdDeductList = await _db.Queryable<LqKdDeductinfoEntity>().Where(w => w.BillingId == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
// 5. 构建品项明细输出,每个品项关联对应的业绩信息
var pxmxOutputList = new List<LqKdPxmxInfoOutput>();
foreach (var pxmx in lqKdPxmxList)
{
var pxmxOutput = new LqKdPxmxInfoOutput
{
id = pxmx.Id,
glkdbh = pxmx.Glkdbh,
px = pxmx.Px,
pxmc = pxmx.Pxmc,
pxjg = pxmx.Pxjg,
projectNumber = pxmx.ProjectNumber,
isEnabled = pxmx.IsEnabled,
sourceType = pxmx.SourceType,
memberId = pxmx.MemberId,
createTime = pxmx.CreateTIme,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
174
|
totalPrice = pxmx.TotalPrice,
|
bff07b1f
“wangming”
Refactor FileVari...
|
175
|
actualPrice = pxmx.ActualPrice,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
176
|
remark = pxmx.Remark,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
177
|
isEffective = pxmx.IsEffective,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
178
179
180
181
182
183
184
185
186
187
|
};
// 关联该品项的健康师业绩
var jksyjForPx = lqKdJksyjList.Where(j => j.Kdpxid == pxmx.Id).ToList();
pxmxOutput.lqKdJksyjList = jksyjForPx.Adapt<List<LqKdJksyjInfoOutput>>();
// 关联该品项的科技部老师业绩
var kjbsyjForPx = lqKdKjbsyjList.Where(k => k.Kdpxid == pxmx.Id).ToList();
pxmxOutput.lqKdKjbsyjList = kjbsyjForPx.Adapt<List<LqKdKjbsyjInfoOutput>>();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
188
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
189
190
191
192
193
194
195
196
197
|
pxmxOutputList.Add(pxmxOutput);
}
// 6. 设置输出结果
output.lqKdPxmxList = pxmxOutputList;
// 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
output.lqKdJksyjList = lqKdJksyjList.Adapt<List<LqKdJksyjInfoOutput>>();
output.lqKdKjbsyjList = lqKdKjbsyjList.Adapt<List<LqKdKjbsyjInfoOutput>>();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
198
199
|
// 8. 设置扣款信息列表
output.lqKdDeductList = lqKdDeductList.Adapt<List<LqKdDeductinfoInfoOutput>>();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
200
201
202
203
204
205
206
207
|
return output;
}
catch (Exception ex)
{
Console.WriteLine($"获取开单记录失败: {ex.Message}");
throw NCCException.Oh(ErrorCode.COM1000, "获取开单记录失败");
}
|
96009bc9
hexiaodong
hxd
|
208
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
209
|
#endregion
|
96009bc9
hexiaodong
hxd
|
210
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
211
|
#region 获取开单记录表列表
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
212
|
|
96009bc9
hexiaodong
hxd
|
213
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
214
215
216
217
|
/// 获取开单记录表列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
218
219
220
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqKdKdjlbListQueryInput input)
{
|
ed462a62
“wangming”
更新开发环境配置和优化客户信息导入功能
|
221
|
var sidx = input.sidx == null ? "kdrq" : input.sidx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
222
|
List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
223
224
|
DateTime? startKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.First()) : null;
DateTime? endKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.Last()) : null;
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
|
// 根据是否传入健康师ID或科技部老师ID,动态构建查询
ISugarQueryable<LqKdKdjlbEntity> baseQuery = null;
if (!string.IsNullOrEmpty(input.jksId) && !string.IsNullOrEmpty(input.kjblsId))
{
// 同时传入健康师ID和科技部老师ID,需要同时关联两个业绩表
baseQuery = _db.Queryable<LqKdJksyjEntity, LqKdKjbsyjEntity, LqKdKdjlbEntity>(
(jksyj, kjbsyj, kdjlb) => jksyj.Glkdbh == kdjlb.Id && kjbsyj.Glkdbh == kdjlb.Id)
.Where((jksyj, kjbsyj, kdjlb) => jksyj.Jkszh == input.jksId && jksyj.IsEffective == StatusEnum.有效.GetHashCode())
.Where((jksyj, kjbsyj, kdjlb) => kjbsyj.Kjbls == input.kjblsId && kjbsyj.IsEffective == StatusEnum.有效.GetHashCode())
.Select((jksyj, kjbsyj, kdjlb) => kdjlb)
.Distinct()
.MergeTable();
}
else if (!string.IsNullOrEmpty(input.jksId))
{
// 只传入健康师ID,关联健康师业绩表
baseQuery = _db.Queryable<LqKdJksyjEntity, LqKdKdjlbEntity>(
(jksyj, kdjlb) => jksyj.Glkdbh == kdjlb.Id)
.Where((jksyj, kdjlb) => jksyj.Jkszh == input.jksId && jksyj.IsEffective == StatusEnum.有效.GetHashCode())
.Select((jksyj, kdjlb) => kdjlb)
.Distinct()
.MergeTable();
}
else if (!string.IsNullOrEmpty(input.kjblsId))
{
// 只传入科技部老师ID,关联科技部老师业绩表
baseQuery = _db.Queryable<LqKdKjbsyjEntity, LqKdKdjlbEntity>(
(kjbsyj, kdjlb) => kjbsyj.Glkdbh == kdjlb.Id)
.Where((kjbsyj, kdjlb) => kjbsyj.Kjbls == input.kjblsId && kjbsyj.IsEffective == StatusEnum.有效.GetHashCode())
.Select((kjbsyj, kdjlb) => kdjlb)
.Distinct()
.MergeTable();
}
else
{
// 没有传入健康师ID或科技部老师ID,使用原来的查询逻辑
baseQuery = _db.Queryable<LqKdKdjlbEntity>();
}
var data = await baseQuery
.WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Kdhyc.Contains(input.keyword) || p.Kdhysjh.Contains(input.keyword))
|
96009bc9
hexiaodong
hxd
|
268
269
270
|
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Equals(input.djmd))
.WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Equals(input.jsj))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
271
272
|
.WhereIF(queryKdrq != null, p => p.Kdrq >= new DateTime(startKdrq.ToDate().Year, startKdrq.ToDate().Month, startKdrq.ToDate().Day, 0, 0, 0))
.WhereIF(queryKdrq != null, p => p.Kdrq <= new DateTime(endKdrq.ToDate().Year, endKdrq.ToDate().Month, endKdrq.ToDate().Day, 23, 59, 59))
|
96009bc9
hexiaodong
hxd
|
273
274
|
.WhereIF(!string.IsNullOrEmpty(input.gjlx), p => p.Gjlx.Equals(input.gjlx))
.WhereIF(!string.IsNullOrEmpty(input.hgjg), p => p.Hgjg.Equals(input.hgjg))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
275
276
277
|
.WhereIF(input.zdyj != null, p => p.Zdyj > input.zdyj)
.WhereIF(input.sfyj != null, p => p.Sfyj > input.sfyj)
.WhereIF(input.qk != null, p => p.Qk > input.qk)
|
96009bc9
hexiaodong
hxd
|
278
|
.WhereIF(!string.IsNullOrEmpty(input.ckfs), p => p.Ckfs.Equals(input.ckfs))
|
96009bc9
hexiaodong
hxd
|
279
280
281
282
283
284
285
286
287
288
|
.WhereIF(!string.IsNullOrEmpty(input.fkfs), p => p.Fkfs.Equals(input.fkfs))
.WhereIF(!string.IsNullOrEmpty(input.fkyy), p => p.Fkyy.Equals(input.fkyy))
.WhereIF(!string.IsNullOrEmpty(input.fkpd), p => p.Fkpd.Contains(input.fkpd))
.WhereIF(!string.IsNullOrEmpty(input.khly), p => p.Khly.Equals(input.khly))
.WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
.WhereIF(!string.IsNullOrEmpty(input.sfskdd), p => p.Sfskdd.Equals(input.sfskdd))
.WhereIF(!string.IsNullOrEmpty(input.jj), p => p.Jj.Contains(input.jj))
.WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
.WhereIF(!string.IsNullOrEmpty(input.kdhy), p => p.Kdhy.Equals(input.kdhy))
.WhereIF(!string.IsNullOrEmpty(input.kdhyc), p => p.Kdhyc.Contains(input.kdhyc))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
289
|
.WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
290
|
.WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
291
|
.WhereIF(!string.IsNullOrEmpty(input.CreateUser), p => p.CreateUser.Equals(input.CreateUser))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
292
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
293
|
.Select(it => new LqKdKdjlbListOutput
|
96009bc9
hexiaodong
hxd
|
294
295
|
{
id = it.Id,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
296
297
298
299
300
301
302
303
304
|
djmd = it.Djmd,
jsj = it.Jsj,
kdrq = it.Kdrq,
gjlx = it.Gjlx,
hgjg = it.Hgjg,
zdyj = it.Zdyj,
sfyj = it.Sfyj,
qk = it.Qk,
ckfs = it.Ckfs,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
305
306
307
308
309
|
fkfs = it.Fkfs,
fkyy = it.Fkyy,
fkpd = it.Fkpd,
khly = it.Khly,
tjr = it.Tjr,
|
41da4257
“wangming”
Refactor LqEventS...
|
310
|
deductAmount = it.DeductAmount,
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
311
312
|
paidDebt = it.PaidDebt,
supplementBillingId = it.SupplementBillingId,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
313
314
315
316
|
sfskdd = it.Sfskdd,
jj = it.Jj,
bz = it.Bz,
kdhy = it.Kdhy,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
317
318
|
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
319
320
321
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
322
323
|
activityId = it.ActivityId,
activityName = SqlFunc.Subqueryable<LqPackageInfoEntity>().Where(x => x.Id == it.ActivityId).Select(x => x.ActivityName),
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
324
325
|
appointmentId = it.AppointmentId,
appointmentTime = it.AppointmentId == null ? (DateTime?)null : SqlFunc.Subqueryable<LqYyjlEntity>().Where(x => x.Id == it.AppointmentId).Select(x => SqlFunc.ToDate(x.Yysj)),
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
326
327
328
329
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
330
331
332
|
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
333
334
335
336
|
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
337
|
itemDetails = await _db.Queryable<LqKdPxmxEntity>().Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
|
.Select(x => new LqKdPxmxInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
projectNumber = x.ProjectNumber,
isEnabled = x.IsEnabled,
sourceType = x.SourceType,
memberId = x.MemberId,
createTime = x.CreateTIme,
totalPrice = x.TotalPrice,
actualPrice = x.ActualPrice,
remark = x.Remark,
isEffective = x.IsEffective
})
.ToListAsync();
}
// 按开单ID分组品项明细
var itemDetailsGrouped = itemDetails.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
362
363
364
365
|
// 批量查询健康师业绩(性能优化:一次性查询所有开单的健康师业绩)
var jksyjList = new List<LqKdJksyjInfoOutput>();
if (billingIds.Any())
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
366
367
368
369
370
371
372
373
374
375
376
377
378
|
jksyjList = await _db.Queryable<LqKdJksyjEntity>().Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).Select(x => new LqKdJksyjInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
kdpxid = x.Kdpxid,
jks = x.Jks,
jksxm = x.Jksxm,
jkszh = x.Jkszh,
jksyj = x.Jksyj,
yjsj = x.Yjsj,
jsj_id = x.Jsj_id,
isEffective = x.IsEffective
}).ToListAsync();
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
379
380
381
382
383
384
|
}
// 批量查询科技部老师业绩(性能优化:一次性查询所有开单的科技部老师业绩)
var kjbsyjList = new List<LqKdKjbsyjInfoOutput>();
if (billingIds.Any())
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
|
kjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>().Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).Select(x => new LqKdKjbsyjInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
kdpxid = x.Kdpxid,
kjbls = x.Kjbls,
kjblsxm = x.Kjblsxm,
kjblszh = x.Kjblszh,
kjblsyj = x.Kjblsyj,
yjsj = x.Yjsj,
isEffective = x.IsEffective
})
.ToListAsync();
}
// 批量查询储扣扣款信息(性能优化:一次性查询所有开单的储扣扣款信息)
var deductinfoList = new List<LqKdDeductinfoInfoOutput>();
if (billingIds.Any())
{
deductinfoList = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => billingIds.Contains(x.BillingId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqKdDeductinfoInfoOutput
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
406
407
|
{
id = x.Id,
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
408
409
410
411
412
413
414
415
416
417
418
|
deductType = x.DeductType,
deductId = x.DeductId,
billingId = x.BillingId,
amount = x.Amount,
isEffective = x.IsEffective,
unitPrice = x.UnitPrice,
itemName = x.ItemName,
itemId = x.ItemId,
createTime = x.CreateTime,
projectNumber = x.ProjectNumber,
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
419
420
421
422
|
})
.ToListAsync();
}
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
423
424
|
// 按开单ID分组储扣扣款信息
var deductinfoGrouped = deductinfoList.GroupBy(x => x.billingId).ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
425
|
// 按开单ID分组健康师业绩
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
426
|
var jksyjGrouped = jksyjList.GroupBy(x => x.glkdbh).ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
427
|
// 按开单ID分组科技部老师业绩
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
428
|
var kjbsyjGrouped = kjbsyjList.GroupBy(x => x.glkdbh).ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
429
430
|
// 为每个开单记录分配品项明细、健康师业绩和科技部老师业绩
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
431
432
|
foreach (var item in data.list)
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
433
434
435
436
|
item.ItemDetails = itemDetailsGrouped.ContainsKey(item.id) ? itemDetailsGrouped[item.id] : new List<LqKdPxmxInfoOutput>();
item.lqKdJksyjList = jksyjGrouped.ContainsKey(item.id) ? jksyjGrouped[item.id] : new List<LqKdJksyjInfoOutput>();
item.lqKdKjbsyjList = kjbsyjGrouped.ContainsKey(item.id) ? kjbsyjGrouped[item.id] : new List<LqKdKjbsyjInfoOutput>();
item.lqKdDeductList = deductinfoGrouped.ContainsKey(item.id) ? deductinfoGrouped[item.id] : new List<LqKdDeductinfoInfoOutput>();
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
437
438
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
439
|
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
440
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
441
|
#endregion
|
96009bc9
hexiaodong
hxd
|
442
|
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
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
|
#region 根据健康师ID获取开单列表
/// <summary>
/// 根据健康师ID获取开单列表
/// </summary>
/// <remarks>
/// 根据健康师ID查询该健康师参与的所有开单记录,支持时间周期查询和分页
///
/// 示例请求:
/// GET /api/Extend/LqKdKdjlb/GetListByJksId?jksId=健康师ID&startTime=2025-01-01&endTime=2025-01-31&currentPage=1&pageSize=10
///
/// 参数说明:
/// - jksId: 健康师ID(必填)
/// - startTime: 开始时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - endTime: 结束时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - djmd: 门店ID(可选)
/// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认1)
/// - currentPage: 当前页码(必填)
/// - pageSize: 每页数量(必填)
///
/// 返回说明:
/// - 返回格式与GetList接口相同,包含开单基本信息及品项明细列表
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>开单列表(分页)</returns>
/// <response code="200">查询成功</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("GetListByJksId")]
public async Task<dynamic> GetListByJksId([FromQuery] LqKdKdjlbListByJksQueryInput input)
{
try
{
if (string.IsNullOrEmpty(input.jksId))
{
throw NCCException.Oh("健康师ID不能为空");
}
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
479
480
|
var sidx = input.sidx == null ? "kdrq" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
|
// 解析时间范围
DateTime? startDate = null;
DateTime? endDate = null;
if (!string.IsNullOrEmpty(input.startTime))
{
startDate = Ext.GetDateTime(input.startTime);
}
if (!string.IsNullOrEmpty(input.endTime))
{
endDate = Ext.GetDateTime(input.endTime);
// 如果只传了日期,则设置为当天的23:59:59
if (endDate.HasValue && !input.endTime.Contains(":"))
{
endDate = new DateTime(endDate.Value.Year, endDate.Value.Month, endDate.Value.Day, 23, 59, 59);
}
}
// 通过健康师业绩表关联查询开单记录
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
499
|
var data = await _db.Queryable<LqKdJksyjEntity, LqKdKdjlbEntity>((jksyj, kdjlb) => jksyj.Glkdbh == kdjlb.Id)
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
|
.Where((jksyj, kdjlb) => jksyj.Jkszh == input.jksId)
.WhereIF(input.isEffective != 0, (jksyj, kdjlb) => jksyj.IsEffective == input.isEffective && kdjlb.IsEffective == input.isEffective)
.WhereIF(input.isEffective == 0, (jksyj, kdjlb) => jksyj.IsEffective == StatusEnum.有效.GetHashCode() && kdjlb.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(startDate.HasValue, (jksyj, kdjlb) => kdjlb.Kdrq >= startDate.Value)
.WhereIF(endDate.HasValue, (jksyj, kdjlb) => kdjlb.Kdrq <= endDate.Value)
.WhereIF(!string.IsNullOrEmpty(input.djmd), (jksyj, kdjlb) => kdjlb.Djmd == input.djmd)
.Select((jksyj, kdjlb) => new LqKdKdjlbListOutput
{
id = kdjlb.Id,
djmd = kdjlb.Djmd,
jsj = kdjlb.Jsj,
kdrq = kdjlb.Kdrq,
gjlx = kdjlb.Gjlx,
hgjg = kdjlb.Hgjg,
zdyj = kdjlb.Zdyj,
sfyj = kdjlb.Sfyj,
qk = kdjlb.Qk,
ckfs = kdjlb.Ckfs,
fkfs = kdjlb.Fkfs,
fkyy = kdjlb.Fkyy,
fkpd = kdjlb.Fkpd,
khly = kdjlb.Khly,
tjr = kdjlb.Tjr,
deductAmount = kdjlb.DeductAmount,
paidDebt = kdjlb.PaidDebt,
supplementBillingId = kdjlb.SupplementBillingId,
sfskdd = kdjlb.Sfskdd,
jj = kdjlb.Jj,
bz = kdjlb.Bz,
kdhy = kdjlb.Kdhy,
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == kdjlb.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == kdjlb.Kdhy).Select(x => x.Sjh),
isEffective = kdjlb.IsEffective,
createUser = kdjlb.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == kdjlb.CreateUser).Select(x => x.RealName),
activityId = kdjlb.ActivityId,
activityName = SqlFunc.Subqueryable<LqPackageInfoEntity>().Where(x => x.Id == kdjlb.ActivityId).Select(x => x.ActivityName),
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
537
538
|
appointmentId = kdjlb.AppointmentId,
appointmentTime = kdjlb.AppointmentId == null ? (DateTime?)null : SqlFunc.Subqueryable<LqYyjlEntity>().Where(x => x.Id == kdjlb.AppointmentId).Select(x => SqlFunc.ToDate(x.Yysj)),
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
|
})
.MergeTable()
.Distinct() // 去重,因为一个开单可能对应多个健康师业绩记录
.OrderBy($"{sidx} {sort}")
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
itemDetails = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqKdPxmxInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
projectNumber = x.ProjectNumber,
isEnabled = x.IsEnabled,
sourceType = x.SourceType,
memberId = x.MemberId,
createTime = x.CreateTIme,
totalPrice = x.TotalPrice,
actualPrice = x.ActualPrice,
remark = x.Remark,
isEffective = x.IsEffective
})
.ToListAsync();
}
// 按开单ID分组品项明细
var itemDetailsGrouped = itemDetails.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个开单记录分配品项明细
foreach (var item in data.list)
{
item.ItemDetails = itemDetailsGrouped.ContainsKey(item.id)
? itemDetailsGrouped[item.id]
: new List<LqKdPxmxInfoOutput>();
}
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
_logger.LogError(ex, $"根据健康师ID获取开单列表失败 - 健康师ID: {input?.jksId}, 开始时间: {input?.startTime}, 结束时间: {input?.endTime}");
throw NCCException.Oh($"根据健康师ID获取开单列表失败: {ex.Message}");
}
}
#endregion
#region 根据科技部老师ID获取开单列表
/// <summary>
/// 根据科技部老师ID获取开单列表
/// </summary>
/// <remarks>
/// 根据科技部老师ID查询该老师参与的所有开单记录,支持时间周期查询和分页
///
/// 示例请求:
/// GET /api/Extend/LqKdKdjlb/GetListByKjbId?kjblsId=科技部老师ID&startTime=2025-01-01&endTime=2025-01-31&currentPage=1&pageSize=10
///
/// 参数说明:
/// - kjblsId: 科技部老师ID(必填)
/// - startTime: 开始时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - endTime: 结束时间(可选,格式:yyyy-MM-dd 或 yyyy-MM-dd HH:mm:ss)
/// - djmd: 门店ID(可选)
/// - isEffective: 是否有效(可选,0=全部,1=有效,2=无效,默认1)
/// - currentPage: 当前页码(必填)
/// - pageSize: 每页数量(必填)
///
/// 返回说明:
/// - 返回格式与GetList接口相同,包含开单基本信息及品项明细列表
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>开单列表(分页)</returns>
/// <response code="200">查询成功</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("GetListByKjbId")]
public async Task<dynamic> GetListByKjbId([FromQuery] LqKdKdjlbListByKjbQueryInput input)
{
try
{
if (string.IsNullOrEmpty(input.kjblsId))
{
throw NCCException.Oh("科技部老师ID不能为空");
}
var sidx = input.sidx == null ? "kdrq" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
// 解析时间范围
DateTime? startDate = null;
DateTime? endDate = null;
if (!string.IsNullOrEmpty(input.startTime))
{
startDate = Ext.GetDateTime(input.startTime);
}
if (!string.IsNullOrEmpty(input.endTime))
{
endDate = Ext.GetDateTime(input.endTime);
// 如果只传了日期,则设置为当天的23:59:59
if (endDate.HasValue && !input.endTime.Contains(":"))
{
endDate = new DateTime(endDate.Value.Year, endDate.Value.Month, endDate.Value.Day, 23, 59, 59);
}
}
// 通过科技部老师业绩表关联查询开单记录
var data = await _db.Queryable<LqKdKjbsyjEntity, LqKdKdjlbEntity>(
(kjbsyj, kdjlb) => kjbsyj.Glkdbh == kdjlb.Id)
.Where((kjbsyj, kdjlb) => kjbsyj.Kjbls == input.kjblsId)
.WhereIF(input.isEffective != 0, (kjbsyj, kdjlb) => kjbsyj.IsEffective == input.isEffective && kdjlb.IsEffective == input.isEffective)
.WhereIF(input.isEffective == 0, (kjbsyj, kdjlb) => kjbsyj.IsEffective == StatusEnum.有效.GetHashCode() && kdjlb.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(startDate.HasValue, (kjbsyj, kdjlb) => kdjlb.Kdrq >= startDate.Value)
.WhereIF(endDate.HasValue, (kjbsyj, kdjlb) => kdjlb.Kdrq <= endDate.Value)
.WhereIF(!string.IsNullOrEmpty(input.djmd), (kjbsyj, kdjlb) => kdjlb.Djmd == input.djmd)
.Select((kjbsyj, kdjlb) => new LqKdKdjlbListOutput
{
id = kdjlb.Id,
djmd = kdjlb.Djmd,
jsj = kdjlb.Jsj,
kdrq = kdjlb.Kdrq,
gjlx = kdjlb.Gjlx,
hgjg = kdjlb.Hgjg,
zdyj = kdjlb.Zdyj,
sfyj = kdjlb.Sfyj,
qk = kdjlb.Qk,
ckfs = kdjlb.Ckfs,
fkfs = kdjlb.Fkfs,
fkyy = kdjlb.Fkyy,
fkpd = kdjlb.Fkpd,
khly = kdjlb.Khly,
tjr = kdjlb.Tjr,
deductAmount = kdjlb.DeductAmount,
paidDebt = kdjlb.PaidDebt,
supplementBillingId = kdjlb.SupplementBillingId,
sfskdd = kdjlb.Sfskdd,
jj = kdjlb.Jj,
bz = kdjlb.Bz,
kdhy = kdjlb.Kdhy,
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == kdjlb.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == kdjlb.Kdhy).Select(x => x.Sjh),
isEffective = kdjlb.IsEffective,
createUser = kdjlb.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == kdjlb.CreateUser).Select(x => x.RealName),
activityId = kdjlb.ActivityId,
activityName = SqlFunc.Subqueryable<LqPackageInfoEntity>().Where(x => x.Id == kdjlb.ActivityId).Select(x => x.ActivityName),
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
693
694
|
appointmentId = kdjlb.AppointmentId,
appointmentTime = kdjlb.AppointmentId == null ? (DateTime?)null : SqlFunc.Subqueryable<LqYyjlEntity>().Where(x => x.Id == kdjlb.AppointmentId).Select(x => SqlFunc.ToDate(x.Yysj)),
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
|
})
.MergeTable()
.Distinct() // 去重,因为一个开单可能对应多个科技部老师业绩记录
.OrderBy($"{sidx} {sort}")
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
itemDetails = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqKdPxmxInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
projectNumber = x.ProjectNumber,
isEnabled = x.IsEnabled,
sourceType = x.SourceType,
memberId = x.MemberId,
createTime = x.CreateTIme,
totalPrice = x.TotalPrice,
actualPrice = x.ActualPrice,
remark = x.Remark,
isEffective = x.IsEffective
})
.ToListAsync();
}
// 按开单ID分组品项明细
var itemDetailsGrouped = itemDetails.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个开单记录分配品项明细
foreach (var item in data.list)
{
item.ItemDetails = itemDetailsGrouped.ContainsKey(item.id)
? itemDetailsGrouped[item.id]
: new List<LqKdPxmxInfoOutput>();
}
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
_logger.LogError(ex, $"根据科技部老师ID获取开单列表失败 - 科技部老师ID: {input?.kjblsId}, 开始时间: {input?.startTime}, 结束时间: {input?.endTime}");
throw NCCException.Oh($"根据科技部老师ID获取开单列表失败: {ex.Message}");
}
}
#endregion
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
752
|
#region 新建开单记录表
|
96009bc9
hexiaodong
hxd
|
753
754
755
756
757
758
759
760
761
762
|
/// <summary>
/// 新建开单记录表
/// </summary>
/// <param name="input">参数</param>
/// <returns></returns>
[HttpPost("")]
public async Task Create([FromBody] LqKdKdjlbCrInput input)
{
var userInfo = await _userManager.GetUserInfo();
var entity = input.Adapt<LqKdKdjlbEntity>();
|
28404662
“wangming”
1111
|
763
|
var HealthInstructorNames = "";
|
96009bc9
hexiaodong
hxd
|
764
|
entity.Id = YitIdHelper.NextId().ToString();
|
d98270e2
“wangming”
Enhance LqEventSe...
|
765
766
|
entity.CreateTime = DateTime.Now;
entity.UpdateTime = DateTime.Now;
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
767
|
entity.IsEffective = StatusEnum.有效.GetHashCode();
|
96009bc9
hexiaodong
hxd
|
768
769
770
771
|
try
{
//开启事务
_db.BeginTran();
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
772
|
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
773
774
775
776
777
778
779
780
781
782
783
784
|
//判断是否有补缴开单ID
if (!string.IsNullOrEmpty(input.supplementBillingId))
{
//查询补缴开单ID
var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.supplementBillingId);
if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode())
{
throw NCCException.Oh("补缴开单记录不存在或已作废");
}
//然后对之前的开单表的补缴金额进行累加
//需要判断补缴金额是否超过欠款金额,只记录应缴金额
var supplementAmount = supplementBillingEntity.Qk - supplementBillingEntity.PaidDebt;
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
785
786
|
supplementBillingEntity.PaidDebt += input.supplementAmount > supplementAmount ? supplementAmount : input.supplementAmount;
await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
787
788
|
}
|
96009bc9
hexiaodong
hxd
|
789
|
//新增开单记录表记录
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
790
|
entity.CreateUser = userInfo.userId;
|
41da4257
“wangming”
Refactor LqEventS...
|
791
|
entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);//计算储扣总金额
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
792
793
|
//保存开单记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
794
|
var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
795
796
797
798
799
|
//循环品相信息
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
|
b45d55f7
“wangming”
Refactor LqEventS...
|
800
801
802
803
804
805
806
807
808
809
810
|
var allDeductEntities = new List<LqKdDeductinfoEntity>();
// 处理扣款信息列表
foreach (var item in input.lqKdKdjlbDeductList)
{
var lqKdDeductEntity = new LqKdDeductinfoEntity
{
Id = YitIdHelper.NextId().ToString(),
BillingId = newEntity.Id,
DeductId = item.DeductId,
DeductType = item.DeductType,
Amount = item.Amount,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
811
812
813
814
815
816
|
ProjectNumber = item.ProjectNumber,
UnitPrice = item.UnitPrice,
ItemName = item.ItemName,
ItemId = item.ItemId,
IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
CreateTime = DateTime.Now, // 设置创建时间
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
817
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.ItemId).Select(x => x.Qt2).FirstAsync(),
|
b45d55f7
“wangming”
Refactor LqEventS...
|
818
819
820
|
};
allDeductEntities.Add(lqKdDeductEntity);
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
821
822
|
// 处理品项明细列表
foreach (var item in input.lqKdPxmxList)
|
96009bc9
hexiaodong
hxd
|
823
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
824
825
|
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
|
96009bc9
hexiaodong
hxd
|
826
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
827
828
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
|
dac8767e
“wangming”
111111111
|
829
|
Yjsj = input.kdrq,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
830
831
|
CreateTIme = DateTime.Now,
MemberId = entity.Kdhy,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
832
|
IsEnabled = StatusEnum.有效.GetHashCode(),
|
023505ba
“wangming”
Enhance LqEventSe...
|
833
834
|
ProjectNumber = item.projectNumber,
TotalPrice = (decimal)(item.pxjg * item.projectNumber),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
835
836
837
838
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
|
850bf205
“wangming”
Add ActualPrice f...
|
839
|
ActualPrice = item.actualPrice,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
840
841
|
Remark = item.remark,
IsEffective = StatusEnum.有效.GetHashCode(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
842
|
ActivityId = input.activityId,
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
843
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
844
845
|
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
846
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
847
848
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
|
96009bc9
hexiaodong
hxd
|
849
|
{
|
28404662
“wangming”
1111
|
850
|
//把jksxm保存到HealthInstructorNames
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
851
|
foreach (var ijks_tem in item.lqKdJksyjList)
|
06553fb7
“wangming”
1
|
852
|
{
|
28404662
“wangming”
1111
|
853
854
855
856
857
858
859
860
861
862
863
864
|
HealthInstructorNames += ijks_tem.jksxm + ",";
allJksyjEntities.Add(new LqKdJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = input.kdrq,
Jsj_id = ijks_tem.jsj_id,
Kdpxid = lqKdPxmxEntity.Id,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
865
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
866
|
ActivityId = input.activityId,
|
28404662
“wangming”
1111
|
867
|
});
|
06553fb7
“wangming”
1
|
868
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
869
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
870
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
871
872
873
874
|
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
|
06553fb7
“wangming”
1
|
875
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
876
877
878
879
880
881
882
883
884
885
886
887
888
|
allKjbsyjEntities.Add(new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = input.kdrq,
Kdpxid = lqKdPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
889
|
);
|
06553fb7
“wangming”
1
|
890
|
}
|
96009bc9
hexiaodong
hxd
|
891
|
}
|
96009bc9
hexiaodong
hxd
|
892
|
}
|
28404662
“wangming”
1111
|
893
|
|
28404662
“wangming”
1111
|
894
|
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
895
|
|
41da4257
“wangming”
Refactor LqEventS...
|
896
897
|
//通过会员id查询会员信息
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
|
759f9f27
“wangming”
123321
|
898
899
900
|
//通过开单记录表查询这个会员开单金额
var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
//如果开单金额小于500,为散客,如果大于500,为会员
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
901
|
if (kdAmount < 500 && kdAmount > 0)
|
759f9f27
“wangming”
123321
|
902
903
904
905
906
907
908
|
{
memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
}
else
{
memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
}
|
41da4257
“wangming”
Refactor LqEventS...
|
909
|
await _db.Updateable(memberInfo).ExecuteCommandAsync();
|
b45d55f7
“wangming”
Refactor LqEventS...
|
910
911
912
913
914
|
// 批量插入扣款信息
if (allDeductEntities.Any())
{
await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
915
916
917
918
|
// 批量插入品项明细
if (allPxmxEntities.Any())
{
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
919
920
921
922
923
924
925
926
927
928
929
|
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
930
931
|
//关闭事务
_db.CommitTran();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
932
933
934
|
// 生成开单记录字符串并发送到企业微信
try
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
935
936
|
//判断如果开单金额大于0,则发送开单记录字符串到企业微信
if (newEntity.Sfyj > 0)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
937
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
938
939
|
var entityInfo = await GetInfo(newEntity.Id);
if (entityInfo != null)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
940
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
941
942
943
944
945
946
|
var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo, HealthInstructorNames);
Console.WriteLine("开单记录字符串生成成功:");
Console.WriteLine(orderRecordString);
// 发送到企业微信群
try
|
e5e15bcb
“wangming”
优化系统功能和性能
|
947
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
948
949
950
951
952
953
954
955
956
|
var sendResult = await _weChatBotService.SendOrderRecordMessage(orderRecordString);
if (sendResult)
{
Console.WriteLine("开单记录已成功发送到企业微信群");
}
else
{
Console.WriteLine("开单记录发送到企业微信群失败");
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
957
|
}
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
958
|
catch (Exception wechatEx)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
959
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
960
|
Console.WriteLine($"发送企业微信消息异常: {wechatEx.Message}");
|
e5e15bcb
“wangming”
优化系统功能和性能
|
961
962
|
}
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
963
964
965
966
967
968
969
|
}
}
catch (Exception ex)
{
// 字符串生成失败不影响主流程,只记录日志
Console.WriteLine($"生成开单记录字符串失败: {ex.Message}");
}
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
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
|
// 播报事业部开单统计数据
try
{
//判断如果开单金额大于0,则播报事业部开单统计数据
if (newEntity.Sfyj > 0 && newEntity.Kdrq.HasValue)
{
var billingDate = newEntity.Kdrq.Value.ToString("yyyy-MM-dd");
var statisticsInput = new BusinessUnitBillingStatisticsInput
{
Date = billingDate
};
var statisticsText = await _dailyReportService.GetBusinessUnitBillingStatisticsText(statisticsInput);
if (!string.IsNullOrEmpty(statisticsText) && !statisticsText.Contains("暂无开单数据"))
{
// 发送到企业微信群
try
{
var sendResult = await _weChatBotService.SendTextMessage(statisticsText);
if (sendResult)
{
Console.WriteLine("事业部开单统计数据已成功发送到企业微信群");
}
else
{
Console.WriteLine("事业部开单统计数据发送到企业微信群失败");
}
}
catch (Exception wechatEx)
{
Console.WriteLine($"发送事业部开单统计数据异常: {wechatEx.Message}");
}
}
}
}
catch (Exception ex)
{
// 播报失败不影响主流程,只记录日志
Console.WriteLine($"播报事业部开单统计数据失败: {ex.Message}");
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
|
}
catch (Exception ex)
{
//回滚事务
_db.RollbackTran();
Console.WriteLine($"开单创建失败: {ex.Message}");
Console.WriteLine($"异常堆栈: {ex.StackTrace}");
throw NCCException.Oh(ErrorCode.COM1000);
}
}
#endregion
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1023
|
#region 获取开单记录表无分页列表
|
96009bc9
hexiaodong
hxd
|
1024
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1025
1026
1027
1028
|
/// 获取开单记录表无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
1029
1030
1031
1032
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqKdKdjlbListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1033
|
List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
1034
1035
1036
1037
1038
1039
|
DateTime? startKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.First()) : null;
DateTime? endKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.Last()) : null;
var data = await _db.Queryable<LqKdKdjlbEntity>()
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Equals(input.djmd))
.WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Equals(input.jsj))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1040
1041
|
.WhereIF(queryKdrq != null, p => p.Kdrq >= new DateTime(startKdrq.ToDate().Year, startKdrq.ToDate().Month, startKdrq.ToDate().Day, 0, 0, 0))
.WhereIF(queryKdrq != null, p => p.Kdrq <= new DateTime(endKdrq.ToDate().Year, endKdrq.ToDate().Month, endKdrq.ToDate().Day, 23, 59, 59))
|
96009bc9
hexiaodong
hxd
|
1042
1043
|
.WhereIF(!string.IsNullOrEmpty(input.gjlx), p => p.Gjlx.Equals(input.gjlx))
.WhereIF(!string.IsNullOrEmpty(input.hgjg), p => p.Hgjg.Equals(input.hgjg))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
1044
1045
1046
|
.WhereIF(input.zdyj != null, p => p.Zdyj > input.zdyj)
.WhereIF(input.sfyj != null, p => p.Sfyj > input.sfyj)
.WhereIF(input.qk != null, p => p.Qk > input.qk)
|
96009bc9
hexiaodong
hxd
|
1047
|
.WhereIF(!string.IsNullOrEmpty(input.ckfs), p => p.Ckfs.Equals(input.ckfs))
|
96009bc9
hexiaodong
hxd
|
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
|
.WhereIF(!string.IsNullOrEmpty(input.fkfs), p => p.Fkfs.Equals(input.fkfs))
.WhereIF(!string.IsNullOrEmpty(input.fkyy), p => p.Fkyy.Equals(input.fkyy))
.WhereIF(!string.IsNullOrEmpty(input.fkpd), p => p.Fkpd.Contains(input.fkpd))
.WhereIF(!string.IsNullOrEmpty(input.khly), p => p.Khly.Equals(input.khly))
.WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
.WhereIF(!string.IsNullOrEmpty(input.sfskdd), p => p.Sfskdd.Equals(input.sfskdd))
.WhereIF(!string.IsNullOrEmpty(input.jj), p => p.Jj.Contains(input.jj))
.WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
.WhereIF(!string.IsNullOrEmpty(input.kdhy), p => p.Kdhy.Equals(input.kdhy))
.WhereIF(!string.IsNullOrEmpty(input.kdhyc), p => p.Kdhyc.Contains(input.kdhyc))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1058
|
.WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1059
|
.WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
1060
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1061
|
.Select(it => new LqKdKdjlbListOutput
|
96009bc9
hexiaodong
hxd
|
1062
1063
|
{
id = it.Id,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1064
1065
1066
1067
1068
1069
1070
1071
1072
|
djmd = it.Djmd,
jsj = it.Jsj,
kdrq = it.Kdrq,
gjlx = it.Gjlx,
hgjg = it.Hgjg,
zdyj = it.Zdyj,
sfyj = it.Sfyj,
qk = it.Qk,
ckfs = it.Ckfs,
|
41da4257
“wangming”
Refactor LqEventS...
|
1073
|
deductAmount = it.DeductAmount,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
|
fkfs = it.Fkfs,
fkyy = it.Fkyy,
fkpd = it.Fkpd,
khly = it.Khly,
tjr = it.Tjr,
sfskdd = it.Sfskdd,
jj = it.Jj,
bz = it.Bz,
kdhy = it.Kdhy,
kdhyc = it.Kdhyc,
kdhysjh = it.Kdhysjh,
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1085
|
fileUrl = it.F_FIleUrl,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1086
1087
1088
1089
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1090
|
return data;
|
96009bc9
hexiaodong
hxd
|
1091
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1092
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1093
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1094
|
#region 导出开单记录表
|
96009bc9
hexiaodong
hxd
|
1095
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1096
1097
1098
1099
|
/// 导出开单记录表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
|
[HttpGet("Actions/Export")]
public async Task<dynamic> Export([FromQuery] LqKdKdjlbListQueryInput input)
{
var userInfo = await _userManager.GetUserInfo();
var exportData = new List<LqKdKdjlbListOutput>();
if (input.dataType == 0)
{
var data = Clay.Object(await this.GetList(input));
exportData = data.Solidify<PageResult<LqKdKdjlbListOutput>>().list;
}
else
{
exportData = await this.GetNoPagingList(input);
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1114
1115
|
List<ParamsModel> paramList =
"[{\"value\":\"开单编号\",\"field\":\"id\"},{\"value\":\"开单会员\",\"field\":\"kdhy\"},{\"value\":\"开单会员名称\",\"field\":\"kdhyc\"},{\"value\":\"会员手机号\",\"field\":\"kdhysjh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"金三角\",\"field\":\"jsj\"},{\"value\":\"开单日期\",\"field\":\"kdrq\"},{\"value\":\"顾客类型\",\"field\":\"gjlx\"},{\"value\":\"合作机构\",\"field\":\"hgjg\"},{\"value\":\"整单业绩\",\"field\":\"zdyj\"},{\"value\":\"实付业绩\",\"field\":\"sfyj\"},{\"value\":\"欠款\",\"field\":\"qk\"},{\"value\":\"储扣方式\",\"field\":\"ckfs\"},{\"value\":\"储扣明细\",\"field\":\"ckmx\"},{\"value\":\"付款方式\",\"field\":\"fkfs\"},{\"value\":\"付款医院\",\"field\":\"fkyy\"},{\"value\":\"付款判断\",\"field\":\"fkpd\"},{\"value\":\"客户来源\",\"field\":\"khly\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"是否首开订单\",\"field\":\"sfskdd\"},{\"value\":\"简介\",\"field\":\"jj\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"健康师业绩\",\"field\":\"jksyj\"},{\"value\":\"科技部老师业绩\",\"field\":\"kjblsyj\"},{\"value\":\"品项信息\",\"field\":\"pxxx\"},{\"value\":\"方案其他\",\"field\":\"F_FIleUrl\"},]".ToList<ParamsModel>();
|
96009bc9
hexiaodong
hxd
|
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
|
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)
{
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1128
|
excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
|
96009bc9
hexiaodong
hxd
|
1129
1130
1131
1132
1133
|
}
}
var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
ExcelExportHelper<LqKdKdjlbListOutput>.Export(exportData, excelconfig, addPath);
var fileName = _userManager.UserId + "|" + addPath + "|xls";
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1134
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
1135
1136
|
return output;
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1137
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1138
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1139
|
#region 批量删除开单记录表
|
96009bc9
hexiaodong
hxd
|
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
|
/// <summary>
/// 批量删除开单记录表
/// </summary>
/// <param name="ids">主键数组</param>
/// <returns></returns>
[HttpPost("batchRemove")]
public async Task BatchRemove([FromBody] List<string> ids)
{
var entitys = await _db.Queryable<LqKdKdjlbEntity>().In(it => it.Id, ids).ToListAsync();
if (entitys.Count > 0)
{
try
{
//开启事务
_db.BeginTran();
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
|
// 检查是否有消耗记录
var billingItemIds = await _db.Queryable<LqKdPxmxEntity>().Where(p => ids.Contains(p.Glkdbh)).Select(p => p.Id).ToListAsync();
if (billingItemIds.Any())
{
var consumeRecords = await _db.Queryable<LqXhPxmxEntity>().Where(x => x.IsEffective == StatusEnum.有效.GetHashCode()).Where(x => billingItemIds.Contains(x.BillingItemId)).AnyAsync();
if (consumeRecords)
{
throw NCCException.Oh("选中的开单记录中有已消耗的记录,不能删除");
}
}
// 检查是否有储扣记录
var deductRecords = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => ids.Contains(x.BillingId) && x.IsEffective == StatusEnum.有效.GetHashCode()).AnyAsync();
if (deductRecords)
{
throw NCCException.Oh("选中的开单记录中有储扣记录,不能删除");
}
|
96009bc9
hexiaodong
hxd
|
1171
|
//批量删除开单记录表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1172
|
await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1173
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1174
|
//清空健康师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1175
|
await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1176
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1177
|
//清空科技部老师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1178
|
await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1179
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1180
|
//清空品项明细
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1181
|
await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1182
1183
1184
1185
|
//清空扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().In(u => u.BillingId, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1186
1187
1188
|
//关闭事务
_db.CommitTran();
}
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1189
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
1190
1191
1192
|
{
//回滚事务
_db.RollbackTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1193
|
throw NCCException.Oh($"批量删除开单记录表失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
1194
1195
1196
|
}
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1197
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1198
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1199
|
#region 更新开单记录表
|
96009bc9
hexiaodong
hxd
|
1200
1201
1202
|
/// <summary>
/// 更新开单记录表
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1203
1204
|
/// <remarks>
/// 更新开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1205
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
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
|
/// 示例请求:
/// ```json
/// {
/// "id": "开单编号",
/// "djmd": "单据门店",
/// "jsj": "金三角",
/// "kdrq": "2025-01-11",
/// "lqKdPxmxList": [
/// {
/// "px": "品项编号",
/// "pxmc": "品项名称",
/// "pxjg": 100.00,
/// "projectNumber": 1,
/// "sourceType": "购买",
/// "lqKdJksyjList": [
/// {
/// "jks": "健康师",
/// "jksxm": "健康师姓名",
/// "jksyj": "100"
/// }
/// ]
/// }
/// ]
/// }
/// ```
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1231
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
|
/// 参数说明:
/// - id: 开单记录主键ID
/// - input: 开单记录更新参数,包含品项明细和业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <param name="input">开单记录更新参数</param>
/// <returns>无返回值</returns>
/// <response code="200">更新成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
1242
1243
1244
1245
1246
1247
1248
1249
|
[HttpPut("{id}")]
public async Task Update(string id, [FromBody] LqKdKdjlbUpInput input)
{
var entity = input.Adapt<LqKdKdjlbEntity>();
try
{
//开启事务
_db.BeginTran();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1250
|
|
96009bc9
hexiaodong
hxd
|
1251
|
//更新开单记录表记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1252
|
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1253
1254
|
//清空原有数据
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1255
1256
1257
|
await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1258
1259
1260
1261
1262
1263
1264
1265
|
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
// 处理品项明细列表
if (input.lqKdPxmxList != null && input.lqKdPxmxList.Any())
|
96009bc9
hexiaodong
hxd
|
1266
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1267
|
foreach (var item in input.lqKdPxmxList)
|
96009bc9
hexiaodong
hxd
|
1268
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1269
1270
1271
1272
1273
1274
1275
1276
|
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = entity.Id,
CreateTIme = DateTime.Now,
MemberId = entity.Kdhy,
IsEnabled = 0,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
1277
1278
|
ProjectNumber = item.projectNumber == 0 ? 1 : item.projectNumber,
TotalPrice = (decimal)(item.pxjg * (item.projectNumber == 0 ? 1 : item.projectNumber)),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1279
1280
1281
1282
1283
1284
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1285
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1286
1287
1288
1289
1290
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
{
foreach (var ijks_tem in item.lqKdJksyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
|
allJksyjEntities.Add(
new LqKdJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = entity.Id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = DateTime.Now,
Jsj_id = ijks_tem.jsj_id,
Kdpxid = lqKdPxmxEntity.Id,
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1305
1306
|
}
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1307
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1308
1309
1310
1311
1312
|
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
|
allKjbsyjEntities.Add(
new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = entity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = DateTime.Now,
Kdpxid = lqKdPxmxEntity.Id,
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1326
1327
|
}
}
|
96009bc9
hexiaodong
hxd
|
1328
|
}
|
96009bc9
hexiaodong
hxd
|
1329
1330
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1331
1332
|
// 批量插入品项明细
if (allPxmxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
1333
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1334
|
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1335
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1336
1337
|
// 批量插入健康师业绩
if (allJksyjEntities.Any())
|
96009bc9
hexiaodong
hxd
|
1338
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1339
1340
1341
1342
1343
1344
|
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1345
|
}
|
96009bc9
hexiaodong
hxd
|
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1001);
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1356
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1357
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1358
|
#region 删除开单记录表
|
96009bc9
hexiaodong
hxd
|
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
|
/// <summary>
/// 删除开单记录表
/// </summary>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task Delete(string id)
{
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
_ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
try
{
//开启事务
_db.BeginTran();
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
|
//先查询开单品项明细
var lqPxmxList = _db.Queryable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ToList();
//判断是否有对应的消耗记录
var consumeRecords = await _db.Queryable<LqXhPxmxEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.BillingItemId)).AnyAsync();
if (consumeRecords)
{
throw NCCException.Oh("选中的开单记录中有已消耗的记录,不能删除");
}
//判断是否有对应的退卡记录
var refundRecords = await _db.Queryable<LqHytkMxEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.BillingItemId)).AnyAsync();
if (refundRecords)
{
throw NCCException.Oh("选中的开单记录中有退卡记录,不能删除");
}
//判断是否有对应的储扣记录
var deductRecords = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.DeductId)).AnyAsync();
if (deductRecords)
{
throw NCCException.Oh("选中的开单记录中有储扣记录,不能删除");
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1392
|
|
96009bc9
hexiaodong
hxd
|
1393
|
//删除开单记录表记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1394
|
await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1395
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1396
|
//清空健康师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1397
|
await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1398
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1399
|
//清空科技部老师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1400
|
await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1401
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1402
|
//清空品项明细
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1403
|
await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1404
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1405
1406
1407
|
//清空扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().Where(u => u.BillingId == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1408
1409
1410
|
//关闭事务
_db.CommitTran();
}
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1411
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
1412
1413
1414
|
{
//回滚事务
_db.RollbackTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1415
|
throw NCCException.Oh($"删除开单记录表失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
1416
1417
|
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1418
|
#endregion
|
b45d55f7
“wangming”
Refactor LqEventS...
|
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
|
#region 获取扣款类型枚举内容
/// <summary>
/// 获取扣款类型枚举内容
/// </summary>
/// <returns>扣款类型枚举列表</returns>
[HttpGet("deduct-types")]
public List<EnumOutput> GetDeductTypes()
{
return Enum.GetValues<DeductTypeEnum>()
.Select(e => new EnumOutput
{
Value = (int)e,
Name = e.ToString(),
Description = e.GetDescription(),
})
.ToList();
}
#endregion
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1438
|
|
5dc762df
“wangming”
Enhance performan...
|
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
|
#region 获取状态枚举内容(所有的状态通用)
/// <summary>
/// 获取状态枚举内容
/// </summary>
/// <returns>状态枚举列表</returns>
[HttpGet("status-enum")]
public List<EnumOutput> GetStatusEnum()
{
return Enum.GetValues<StatusEnum>()
.Select(e => new EnumOutput
{
Value = (int)e,
Name = e.ToString(),
Description = e.GetDescription(),
})
.ToList();
}
#endregion
|
ada64779
“wangming”
refactor: 简化开单记录修...
|
1458
|
#region 修改开单记录
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1459
|
/// <summary>
|
ada64779
“wangming”
refactor: 简化开单记录修...
|
1460
|
/// 修改开单记录
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
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
|
/// </summary>
/// <remarks>
/// 更新开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
///
/// 示例请求:
/// ```json
/// {
/// "id": "开单编号",
/// "djmd": "单据门店",
/// "jsj": "金三角",
/// "kdrq": "2025-01-11",
/// "lqKdPxmxList": [
/// {
/// "px": "品项编号",
/// "pxmc": "品项名称",
/// "pxjg": 100.00,
/// "projectNumber": 1,
/// "sourceType": "购买",
/// "lqKdJksyjList": [
/// {
/// "jks": "健康师",
/// "jksxm": "健康师姓名",
/// "jksyj": "100"
/// }
/// ]
/// }
/// ]
/// }
/// ```
///
/// 参数说明:
/// - id: 开单记录主键ID
/// - input: 开单记录更新参数,包含品项明细和业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <param name="input">开单记录更新参数</param>
/// <returns>无返回值</returns>
/// <response code="200">更新成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
[HttpPut("UpdateForNoDelete/{id}")]
public async Task UpdateForNoDelete(string id, [FromBody] LqKdKdjlbUpInput input)
{
var entity = input.Adapt<LqKdKdjlbEntity>();
entity.Id = id; // 确保ID正确设置
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1506
1507
|
try
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1508
1509
1510
1511
1512
1513
|
//检查开单记录是否可以操作
var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(id);
if (!canCancel)
{
throw NCCException.Oh(errorMessage);
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1514
1515
|
//开启事务
_db.BeginTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
|
//查询是否有对应的补缴开单ID
if (!string.IsNullOrEmpty(entity.SupplementBillingId))
{
//查询补缴开单ID
var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == entity.SupplementBillingId);//900,900
if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode())
{
throw NCCException.Oh("补缴开单记录不存在或已作废");
}
//查询当前开单已经补缴金额
var OldSupplementAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.Id == id).SumAsync(p => p.SupplementAmount);//900,0
supplementBillingEntity.PaidDebt = supplementBillingEntity.PaidDebt - OldSupplementAmount + input.supplementAmount;
await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1530
|
// 更新开单记录主表
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1531
|
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).IgnoreColumns(x => x.CreateTime).ExecuteCommandAsync();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1532
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
|
//清空原有品项明细
await _db.Deleteable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
//清空原有健康师业绩
await _db.Deleteable<LqKdJksyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
//清空原有科技部老师业绩
await _db.Deleteable<LqKdKjbsyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
//清空原有扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().Where(x => x.BillingId == id).ExecuteCommandAsync();
//循环品相信息
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
var allDeductEntities = new List<LqKdDeductinfoEntity>();
// 处理扣款信息列表
foreach (var item in input.lqKdKdjlbDeductList)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1549
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
|
var lqKdDeductEntity = new LqKdDeductinfoEntity
{
Id = YitIdHelper.NextId().ToString(),
BillingId = id,
DeductId = item.DeductId,
DeductType = item.DeductType,
Amount = item.Amount,
ProjectNumber = item.ProjectNumber,
UnitPrice = item.UnitPrice,
ItemName = item.ItemName,
ItemId = item.ItemId,
IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
CreateTime = DateTime.Now, // 设置创建时间
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1563
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.DeductId).Select(x => x.Qt2).FirstAsync(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1564
1565
1566
1567
1568
1569
1570
1571
|
};
allDeductEntities.Add(lqKdDeductEntity);
}
// 处理品项明细列表
foreach (var item in input.lqKdPxmxList)
{
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1572
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = id,
Yjsj = input.kdrq,
CreateTIme = DateTime.Now,
MemberId = entity.Kdhy,
IsEnabled = StatusEnum.有效.GetHashCode(),
ProjectNumber = item.projectNumber,
TotalPrice = (decimal)(item.pxjg * item.projectNumber),
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
ActualPrice = item.actualPrice,
Remark = item.remark,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
1589
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1590
1591
|
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1592
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1593
1594
1595
1596
1597
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
{
//把jksxm保存到HealthInstructorNames
foreach (var ijks_tem in item.lqKdJksyjList)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1598
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1599
|
allJksyjEntities.Add(new LqKdJksyjEntity
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1600
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = input.kdrq,
Jsj_id = ijks_tem.jsj_id,
Kdpxid = lqKdPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
});
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1613
|
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1614
1615
1616
1617
1618
1619
|
}
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1620
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1621
|
allKjbsyjEntities.Add(new LqKdKjbsyjEntity
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1622
1623
|
{
Id = YitIdHelper.NextId().ToString(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1624
1625
1626
1627
1628
1629
1630
1631
1632
|
Glkdbh = id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = input.kdrq,
Kdpxid = lqKdPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1633
|
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1634
|
);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1635
1636
1637
1638
|
}
}
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
|
//通过会员id查询会员信息
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
//通过开单记录表查询这个会员开单金额
var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
//如果开单金额小于500,为散客,如果大于500,为会员
if (kdAmount < 500)
{
memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
}
else
{
memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
}
await _db.Updateable(memberInfo).ExecuteCommandAsync();
// 批量插入扣款信息
if (allDeductEntities.Any())
{
await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
}
// 批量插入品项明细
if (allPxmxEntities.Any())
{
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1676
1677
1678
|
//关闭事务
_db.CommitTran();
}
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
1679
|
catch (Exception ex)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1680
1681
1682
|
{
//回滚事务
_db.RollbackTran();
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
1683
|
throw NCCException.Oh($"创建开单记录失败: {ex.Message}");
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1684
1685
1686
1687
|
}
}
#endregion
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1688
1689
1690
1691
|
#region 作废开单记录
/// <summary>
/// 作废开单记录
/// </summary>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1692
|
/// <param name="input">作废开单记录输入</param>
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1693
|
/// <returns>无返回值</returns>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
|
/// <remarks>
/// 作废指定的开单记录,包括相关的品项明细、业绩记录等
///
/// 示例请求:
/// ```json
/// {
/// "id": "123456789",
/// "remarks": "客户要求作废此订单"
/// }
/// ```
///
/// 参数说明:
/// - id: 开单记录主键ID(必填)
/// - remarks: 作废备注说明
/// </remarks>
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1709
1710
1711
1712
|
/// <response code="200">作废成功</response>
/// <response code="400">参数错误,开单记录ID不能为空</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1713
1714
|
[HttpPut("Cancel")]
public async Task Cancel(CancelBillingInput input)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1715
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1716
|
if (string.IsNullOrEmpty(input.Id))
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1717
1718
1719
|
{
throw NCCException.Oh("开单记录ID不能为空");
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1720
1721
1722
1723
|
try
{
//开启事务
_db.BeginTran();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1724
1725
1726
1727
1728
1729
|
// 检查开单记录是否可以作废
var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(input.Id);
if (!canCancel)
{
throw NCCException.Oh(errorMessage);
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1730
1731
|
// 查询开单记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1732
|
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.Id);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1733
1734
1735
1736
1737
|
if (entity == null)
{
throw NCCException.Oh("开单记录不存在");
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1738
1739
1740
1741
|
// 标记开单记录为无效,并添加作废备注
entity.IsEffective = StatusEnum.无效.GetHashCode();
entity.CancelRefRemarks = input.Remarks;
entity.UpdateTime = DateTime.Now;
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1742
|
await _db.Updateable(entity).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1743
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1744
|
// 标记对应开单明细表为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1745
|
await _db.Updateable<LqKdPxmxEntity>().SetColumns(it => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1746
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1747
|
// 标记健康师业绩为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1748
|
await _db.Updateable<LqKdJksyjEntity>().SetColumns(it => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1749
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1750
|
// 标记科技部老师业绩为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1751
|
await _db.Updateable<LqKdKjbsyjEntity>().SetColumns(it => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1752
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1753
|
// 标记开单_储扣详细表为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1754
|
await _db.Updateable<LqKdDeductinfoEntity>().SetColumns(it => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.BillingId == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1755
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
|
//如果存在补缴开单ID,则将补缴开单ID的IsEffective设置为无效
if (!string.IsNullOrEmpty(entity.SupplementBillingId))
{
var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == entity.SupplementBillingId);
if (supplementBillingEntity != null && supplementBillingEntity.IsEffective == StatusEnum.有效.GetHashCode())
{
supplementBillingEntity.PaidDebt = supplementBillingEntity.PaidDebt - entity.SupplementAmount;
await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
}
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1766
1767
1768
|
//关闭事务
_db.CommitTran();
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1769
|
catch (Exception ex)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1770
1771
1772
|
{
//回滚事务
_db.RollbackTran();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1773
|
throw NCCException.Oh($"作废开单记录失败: {ex.Message}");
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1774
1775
1776
1777
|
}
}
#endregion
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
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
|
#region 历史会员权益数据导入
/// <summary>
/// 导入历史会员权益数据到开单记录表和开单品项明细表
/// </summary>
/// <remarks>
/// 将历史会员权益表的数据导入到开单记录表和开单品项明细表中
///
/// 导入规则:
/// 1. 逐条处理历史会员权益数据,每条记录生成一个开单记录和一个品项明细
/// 2. 开单时间和创建时间统一设置为 2025-06-01 00:00:00
/// 3. 使用YitIdHelper生成所有ID
/// 4. 直接使用F_StoreId作为门店ID
///
/// 字段映射:
/// - F_MemberId/会员编号 -> kdhy (开单会员,优先使用会员ID)
/// - 会员名称 -> kdhyc (开单会员名称)
/// - 会员电话 -> kdhysjh (开单会员手机号)
/// - F_StoreId -> djmd (单据门店ID)
/// - 整单业绩 -> zdyj (整单业绩)
/// - 实付业绩 -> sfyj (实付业绩)
/// - 欠款 -> qk (欠款)
/// - 来源 -> khly (客户来源)
/// - 品项名称 -> pxmc (品项名称)
/// - 品项价格 -> pxjg (品项价格)
/// - 品项次数 -> F_ProjectNumber (项目次数)
/// - F_MemberId/会员编号 -> F_MemberId (品项明细会员ID,优先使用会员ID)
/// </remarks>
/// <returns>导入结果统计</returns>
/// <response code="200">导入成功</response>
/// <response code="500">服务器内部错误</response>
[HttpPost("import-history-member-rights")]
public async Task<dynamic> ImportHistoryMemberRights()
{
try
{
_db.BeginTran();
// 设置固定的时间
var fixedDateTime = new DateTime(2025, 6, 1, 0, 0, 0);
// 1. 查询历史会员权益数据
var historyData = await _db.Ado.SqlQueryAsync<dynamic>(@"
SELECT
会员编号,
会员名称,
会员电话,
开单门店,
开单时间,
整单业绩,
实付业绩,
欠款,
来源,
品项名称,
品项价格,
品项次数,
F_StoreId,
F_ProjectId,
F_MemberId
FROM `历史会员权益`");
int successCount = 0;
int errorCount = 0;
var errorMessages = new List<string>();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1842
1843
1844
1845
1846
|
// 2. 批量处理数据,每批1000条
const int batchSize = 1000;
var totalBatches = (int)Math.Ceiling((double)historyData.Count / batchSize);
for (int batchIndex = 0; batchIndex < totalBatches; batchIndex++)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1847
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1848
|
var batchData = historyData.Skip(batchIndex * batchSize).Take(batchSize).ToList();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1849
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1850
1851
1852
1853
1854
1855
|
var kdjlbEntities = new List<LqKdKdjlbEntity>();
var pxmxEntities = new List<LqKdPxmxEntity>();
foreach (var item in batchData)
{
try
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1856
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
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
|
// 3. 生成开单记录ID
string kdjlbId = YitIdHelper.NextId().ToString();
// 4. 创建开单记录
var kdjlbEntity = new LqKdKdjlbEntity
{
Id = kdjlbId,
Djmd = (string)item.F_StoreId, // 直接使用F_StoreId
Kdhy = (string)item.F_MemberId,
Kdhyc = (string)item.会员名称,
Jsj = "暂无",
Kdhysjh = (string)item.会员电话,
Kdrq = fixedDateTime,
Zdyj = Convert.ToDecimal(item.整单业绩 ?? 0),
Sfyj = Convert.ToDecimal(item.实付业绩 ?? 0),
Qk = Convert.ToDecimal(item.欠款 ?? 0),
CreateTime = fixedDateTime,
UpdateTime = fixedDateTime,
Sfskdd = "否",
IsEffective = 1,
Bz = "导入历史会员权益数据"
};
kdjlbEntities.Add(kdjlbEntity);
// 5. 创建品项明细
string pxmxId = YitIdHelper.NextId().ToString();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1884
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
|
var pxmxEntity = new LqKdPxmxEntity
{
Id = pxmxId,
Glkdbh = kdjlbId,
Px = (string)item.F_ProjectId,
Pxmc = (string)item.品项名称,
Pxjg = Convert.ToDecimal(item.品项价格 ?? 0) / Convert.ToDecimal(item.品项次数 ?? 0),
ProjectNumber = Convert.ToDecimal(item.品项次数 ?? 0),
SourceType = (string)item.来源,
MemberId = (string)item.F_MemberId,
Yjsj = fixedDateTime,
CreateTIme = fixedDateTime,
IsEffective = 1,
IsEnabled = 0,
TotalPrice = Convert.ToDecimal(item.品项价格 ?? 0),
ActualPrice = Convert.ToDecimal(item.品项价格 ?? 0)
};
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1902
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1903
|
pxmxEntities.Add(pxmxEntity);
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1904
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1905
1906
1907
|
successCount++;
}
catch (Exception ex)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1908
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1909
1910
1911
1912
|
errorCount++;
errorMessages.Add($"处理记录 {(string)item.会员编号}-{(string)item.品项名称} 时出错: {ex.Message}");
}
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1913
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1914
1915
1916
1917
1918
|
// 6. 批量插入开单记录
if (kdjlbEntities.Any())
{
await _db.Insertable(kdjlbEntities).ExecuteCommandAsync();
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1919
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1920
1921
1922
1923
|
// 7. 批量插入品项明细
if (pxmxEntities.Any())
{
await _db.Insertable(pxmxEntities).ExecuteCommandAsync();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1924
|
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1925
1926
1927
|
// 8. 显示进度
if (batchIndex % 10 == 0)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1928
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1929
|
Console.WriteLine($"已处理 {batchIndex + 1}/{totalBatches} 批次,成功 {successCount} 条,失败 {errorCount} 条");
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
|
}
}
_db.CommitTran();
return new
{
success = true,
message = "历史会员权益数据导入完成",
totalRecords = historyData.Count,
successCount = successCount,
errorCount = errorCount,
errorMessages = errorMessages.Take(10).ToList(), // 只返回前10个错误信息
importTime = DateTime.Now
};
}
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
1946
|
catch (Exception ex)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1947
1948
1949
1950
1951
1952
|
{
_db.RollbackTran();
throw NCCException.Oh($"导入历史会员权益数据失败: {ex.Message}");
}
}
#endregion
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1953
|
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1954
|
#region 根据门店获取该门店的欠款记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1955
|
/// <summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1956
|
/// 根据门店获取该门店的欠款记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1957
|
/// </summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1958
1959
|
/// <param name="input">查询参数</param>
/// <returns>分页的欠款记录</returns>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1960
|
/// <remarks>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1961
|
/// 获取指定门店的欠款记录,考虑已缴欠款情况,支持分页
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1962
1963
1964
1965
|
///
/// 示例请求:
/// ```json
/// {
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1966
1967
1968
1969
1970
|
/// "storeId": "门店ID",
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "Kdrq",
/// "sort": "desc"
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1971
1972
1973
1974
|
/// }
/// ```
///
/// 参数说明:
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1975
1976
1977
1978
1979
1980
1981
1982
1983
|
/// - storeId: 门店ID,必填
/// - currentPage: 当前页码
/// - pageSize: 每页大小
/// - sidx: 排序字段,默认按开单日期
/// - sort: 排序方式,默认降序
///
/// 返回说明:
/// - 只返回仍有欠款的记录(总欠款 > 已缴欠款)
/// - 包含开单编号、客户信息、欠款金额、已缴金额等
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1984
|
/// </remarks>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1985
1986
1987
1988
1989
|
/// <response code="200">成功返回分页的欠款记录列表</response>
/// <response code="400">门店ID不能为空</response>
/// <response code="500">服务器错误</response>
[HttpGet("GetDebtRecordByStoreId")]
public async Task<dynamic> GetDebtRecordByStoreId([FromQuery] DebtRecordQueryInput input)
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1990
1991
1992
|
{
try
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1993
|
if (string.IsNullOrEmpty(input.StoreId))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1994
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1995
|
throw NCCException.Oh("门店ID不能为空");
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1996
|
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1997
1998
1999
2000
2001
2002
2003
|
var sidx = string.IsNullOrEmpty(input.sidx) ? "Kdrq" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort;
// 获取该门店的欠款记录,考虑已缴欠款情况
// 只返回仍有欠款的记录:总欠款 > 已缴欠款
var debtRecords = await _db.Queryable<LqKdKdjlbEntity>()
.Where(p => p.Djmd == input.StoreId && p.Qk > p.PaidDebt && p.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new LqKdKdjlbListOutput
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2004
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
|
id = it.Id,
djmd = it.Djmd,
jsj = it.Jsj,
kdrq = it.Kdrq,
gjlx = it.Gjlx,
hgjg = it.Hgjg,
zdyj = it.Zdyj,
sfyj = it.Sfyj,
qk = it.Qk,
ckfs = it.Ckfs,
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
2015
|
paidDebt = it.PaidDebt,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
|
fkfs = it.Fkfs,
fkyy = it.Fkyy,
fkpd = it.Fkpd,
khly = it.Khly,
tjr = it.Tjr,
deductAmount = it.DeductAmount,
sfskdd = it.Sfskdd,
jj = it.Jj,
bz = it.Bz,
kdhy = it.Kdhy,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
2026
2027
|
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
2028
2029
2030
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2031
2032
2033
2034
2035
2036
|
})
.MergeTable()
.OrderBy(sidx + " " + sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(debtRecords);
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2037
2038
2039
|
}
catch (Exception ex)
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2040
|
throw NCCException.Oh($"获取门店欠款记录失败: {ex.Message}");
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2041
2042
2043
2044
|
}
}
#endregion
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
|
#region 获取某个会员的开单记录
/// <summary>
/// 获取某个会员的开单记录
/// </summary>
/// <remarks>
/// 根据会员ID查询该会员的所有开单记录,支持分页和时间筛选
///
/// 示例请求:
/// ```json
/// {
/// "memberId": "会员ID",
/// "storeId": "门店ID",
/// "startTime": "2025-01-01",
/// "endTime": "2025-12-31",
/// "currentPage": 1,
/// "pageSize": 20
/// }
/// ```
///
/// 参数说明:
/// - memberId: 会员ID(必填)
/// - storeId: 门店ID(可选)
/// - startTime: 开始时间(可选)
/// - endTime: 结束时间(可选)
/// - currentPage: 当前页码
/// - pageSize: 每页大小
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>分页的开单记录列表</returns>
/// <response code="200">成功返回会员开单记录列表</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器错误</response>
[HttpGet("GetBillingRecordByMemberId")]
public async Task<dynamic> GetBillingRecordByMemberId([FromQuery] BillingRecordQueryInput input)
{
try
{
var sidx = input.sidx == null ? "kdrq" : input.sidx;
var data = await _db.Queryable<LqKdKdjlbEntity>()
.Where(p => p.Kdhy == input.MemberId)
.WhereIF(input.StartTime.HasValue, p => p.Kdrq >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, p => p.Kdrq <= input.EndTime.Value)
.Select(it => new LqKdKdjlbListOutput
{
id = it.Id,
djmd = it.Djmd,
jsj = it.Jsj,
kdrq = it.Kdrq,
gjlx = it.Gjlx,
hgjg = it.Hgjg,
zdyj = it.Zdyj,
sfyj = it.Sfyj,
qk = it.Qk,
ckfs = it.Ckfs,
fkfs = it.Fkfs,
fkyy = it.Fkyy,
fkpd = it.Fkpd,
khly = it.Khly,
tjr = it.Tjr,
deductAmount = it.DeductAmount,
sfskdd = it.Sfskdd,
jj = it.Jj,
bz = it.Bz,
kdhy = it.Kdhy,
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
2112
2113
2114
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
2115
|
appointmentId = it.AppointmentId,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
itemDetails = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqKdPxmxInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
projectNumber = x.ProjectNumber,
isEnabled = x.IsEnabled,
sourceType = x.SourceType,
memberId = x.MemberId,
createTime = x.CreateTIme,
totalPrice = x.TotalPrice,
actualPrice = x.ActualPrice,
remark = x.Remark,
isEffective = x.IsEffective
})
.ToListAsync();
}
// 按开单ID分组品项明细
var itemDetailsGrouped = itemDetails.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个开单记录分配品项明细
foreach (var item in data.list)
{
item.ItemDetails = itemDetailsGrouped.ContainsKey(item.id)
? itemDetailsGrouped[item.id]
: new List<LqKdPxmxInfoOutput>();
}
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
throw NCCException.Oh($"获取会员开单记录失败: {ex.Message}");
}
}
#endregion
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
|
#region 根据开单id获取当前开单欠款信息
/// <summary>
/// 根据开单id获取当前开单欠款信息
/// </summary>
/// <param name="billingId">开单记录ID</param>
/// <returns>当前开单欠款信息</returns>
[HttpGet("GetBillingDebtInfo/{billingId}")]
public async Task<dynamic> GetBillingDebtInfoByBillingId(string billingId)
{
//返回 整单金额、实付金额、欠款金额、已缴欠款金额
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == billingId);
if (entity == null)
{
throw NCCException.Oh("开单记录不存在");
}
return new
{
zdyj = entity.Zdyj,
sfyj = entity.Sfyj,
qk = entity.Qk,
PaidDebt = entity.PaidDebt,
};
}
#endregion
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
|
#region 修改开单金额
/// <summary>
/// 修改开单金额
/// </summary>
/// <param name="input">修改开单金额输入</param>
/// <returns>修改结果</returns>
/// <remarks>
/// 修改开单记录表的金额以及品项明细表里面的金额
///
/// 示例请求:
/// ```json
/// {
/// "billingId": "123456789",
/// "zdyj": 1000.00,
/// "sfyj": 800.00,
/// "deductAmount": 200.00,
/// "qk": 0.00,
/// "itemDetails": [
/// {
/// "itemDetailId": "item001",
/// "pxjg": 500.00,
/// "totalPrice": 500.00,
/// "actualPrice": 400.00
/// }
/// ],
/// "remark": "金额调整"
/// }
/// ```
///
/// 参数说明:
/// - billingId: 开单记录ID(必填)
/// - zdyj: 整单业绩
/// - sfyj: 实付业绩
/// - deductAmount: 储扣总金额
/// - qk: 欠款
/// - itemDetails: 品项明细金额列表
/// - remark: 修改备注
/// </remarks>
/// <response code="200">成功修改开单金额</response>
/// <response code="400">请求参数错误</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
[HttpPut("UpdateBillingAmount")]
public async Task<dynamic> UpdateBillingAmount(LqKdKdjlbUpdateAmountInput input)
{
try
{
// 验证输入参数
if (string.IsNullOrEmpty(input.BillingId))
{
throw NCCException.Oh("开单记录ID不能为空");
}
// 检查开单记录是否存在且有效
var billingEntity = await _db.Queryable<LqKdKdjlbEntity>().Where(w => w.Id == input.BillingId && w.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (billingEntity == null)
{
throw NCCException.Oh("开单记录不存在或已作废");
}
// 验证品项明细
if (input.ItemDetails != null && input.ItemDetails.Any())
{
var itemDetailIds = input.ItemDetails.Select(x => x.ItemDetailId).ToList();
var existingItems = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == input.BillingId && itemDetailIds.Contains(w.Id)).ToListAsync();
if (existingItems.Count != input.ItemDetails.Count)
{
throw NCCException.Oh("部分品项明细不存在或不属于该开单记录");
}
}
// 开始事务
_db.BeginTran();
try
{
// 更新开单记录金额
var updateResult = await _db.Updateable<LqKdKdjlbEntity>().SetColumns(it => new LqKdKdjlbEntity
{
Zdyj = input.Zdyj,
Sfyj = input.Sfyj,
DeductAmount = input.DeductAmount,
Qk = input.Qk,
UpdateTime = DateTime.Now
}).Where(w => w.Id == input.BillingId).ExecuteCommandAsync();
if (updateResult <= 0)
{
throw NCCException.Oh("更新开单记录金额失败");
}
// 更新品项明细金额
if (input.ItemDetails != null && input.ItemDetails.Any())
{
foreach (var itemDetail in input.ItemDetails)
{
var itemUpdateResult = await _db.Updateable<LqKdPxmxEntity>().SetColumns(it => new LqKdPxmxEntity
{
Pxjg = itemDetail.Pxjg,
TotalPrice = itemDetail.TotalPrice,
ActualPrice = itemDetail.ActualPrice
}).Where(w => w.Id == itemDetail.ItemDetailId && w.Glkdbh == input.BillingId).ExecuteCommandAsync();
if (itemUpdateResult <= 0)
{
throw NCCException.Oh($"更新品项明细金额失败,品项ID: {itemDetail.ItemDetailId}");
}
}
}
// 提交事务
_db.CommitTran();
return "修改开单金额成功";
}
catch (Exception ex)
{
// 回滚事务
_db.RollbackTran();
throw NCCException.Oh($"修改开单金额失败: {ex.Message}");
}
}
catch (Exception ex)
{
throw NCCException.Oh($"修改开单金额时发生错误: {ex.Message}");
}
}
#endregion
#region 获取门店某个时间段的开单记录汇总信息
/// <summary>
/// 获取门店某个时间段的开单记录汇总信息
/// </summary>
/// <param name="input">查询参数</param>
/// <returns>开单记录汇总信息</returns>
[HttpGet("GetBillingRecordSummaryByStoreId")]
public async Task<dynamic> GetBillingRecordSummaryByStoreId([FromQuery] BillingRecordSummaryQueryInput input)
{
try
{
// 验证参数
if (string.IsNullOrEmpty(input.StoreId))
{
throw NCCException.Oh("门店ID不能为空");
}
// 如果开始时间和结束时间为空,就默认是当月
if (input.StartTime == null || input.EndTime == null)
{
input.StartTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
input.EndTime = DateTime.Now.AddDays(DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month));
}
// 查询开单记录
var billingRecords = await _db.Queryable<LqKdKdjlbEntity>()
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
2344
|
.Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode())
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
|
.Select(it => new
{
id = it.Id,
djmd = it.Djmd,
jsj = it.Jsj,
kdrq = it.Kdrq,
gjlx = it.Gjlx,
zdyj = it.Zdyj,
sfyj = it.Sfyj,
qk = it.Qk,
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
2355
2356
|
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
|
fkfs = it.Fkfs, // 付款方式
khly = it.Khly, // 客户来源
bz = it.Bz, // 备注
createTime = it.CreateTime
})
.ToListAsync();
if (!billingRecords.Any())
{
return new
{
success = true,
data = new
{
billingSummary = new
{
totalCount = 0,
totalAmount = 0,
totalPaidAmount = 0,
totalDebt = 0,
billingRecords = new List<object>()
},
itemSummary = new
{
purchased = new { count = 0, totalAmount = 0, items = new List<object>() },
gifted = new { count = 0, totalAmount = 0, items = new List<object>() },
experience = new { count = 0, totalAmount = 0, items = new List<object>() }
},
healthTeacherSummary = new
{
totalCount = 0,
teachers = new List<object>()
}
},
message = "该时间段内无开单记录"
};
}
var billingIds = billingRecords.Select(x => x.id).ToList();
// 查询品项明细,按F_SourceType分类
var itemDetails = await _db.Queryable<LqKdPxmxEntity>()
.Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new
{
id = it.Id,
glkdbh = it.Glkdbh,
px = it.Px,
pxmc = it.Pxmc,
pxjg = it.Pxjg,
sourceType = it.SourceType,
totalPrice = it.TotalPrice,
actualPrice = it.ActualPrice,
projectNumber = it.ProjectNumber,
remark = it.Remark
})
.ToListAsync();
// 按来源类型分类品项
var purchasedItems = itemDetails.Where(x => x.sourceType == "购买").ToList();
var giftedItems = itemDetails.Where(x => x.sourceType == "赠送").ToList();
var experienceItems = itemDetails.Where(x => x.sourceType == "体验").ToList();
// 查询健康师业绩数据
var healthTeacherData = await _db.Queryable<LqKdJksyjEntity>()
.Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new
{
id = it.Id,
glkdbh = it.Glkdbh,
jks = it.Jks,
jksxm = it.Jksxm,
jkszh = it.Jkszh,
jksyj = it.Jksyj,
kdpxid = it.Kdpxid,
yjsj = it.Yjsj,
jsj_id = it.Jsj_id
})
.ToListAsync();
// 构建按开单记录分组的详细数据
var detailedRecords = billingRecords.Select(billing => new
{
// 基本信息
date = billing.kdrq?.ToString("yyyy-MM-dd"),
customerName = billing.kdhyc,
customerPhone = billing.kdhysjh,
storeId = billing.djmd,
goldTriangle = billing.jsj,
customerType = billing.gjlx,
// 品项分类
purchasedItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "购买").Select(x => new
{
id = x.id,
itemName = x.pxmc,
itemCode = x.px,
price = x.pxjg,
totalPrice = x.totalPrice,
actualPrice = x.actualPrice,
projectNumber = x.projectNumber,
remark = x.remark
}).ToList(),
giftedItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "赠送").Select(x => new
{
id = x.id,
itemName = x.pxmc,
itemCode = x.px,
price = x.pxjg,
totalPrice = x.totalPrice,
actualPrice = x.actualPrice,
projectNumber = x.projectNumber,
remark = x.remark
}).ToList(),
experienceItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "体验").Select(x => new
{
id = x.id,
itemName = x.pxmc,
itemCode = x.px,
price = x.pxjg,
totalPrice = x.totalPrice,
actualPrice = x.actualPrice,
projectNumber = x.projectNumber,
remark = x.remark
}).ToList(),
// 金额信息
paidAmount = billing.sfyj,
debtAmount = billing.qk,
totalAmount = billing.zdyj,
// 健康师信息
healthTeachers = healthTeacherData.Where(x => x.glkdbh == billing.id).Select(x => new
{
teacherId = x.jks,
teacherName = x.jksxm,
teacherAccount = x.jkszh,
performance = x.jksyj,
performanceTime = x.yjsj,
itemDetailId = x.kdpxid,
goldTriangleId = x.jsj_id
}).ToList(),
// 其他信息
source = billing.khly, // 客户来源
paymentMethod = billing.fkfs, // 支付方式
remark = billing.bz, // 备注
createTime = billing.createTime
}).OrderByDescending(x => x.date).ToList();
// 构建返回结果
var result = new
{
success = true,
data = new
{
// 汇总统计
summary = new
{
totalCount = billingRecords.Count,
totalAmount = billingRecords.Sum(x => x.zdyj),
totalPaidAmount = billingRecords.Sum(x => x.sfyj),
totalDebt = billingRecords.Sum(x => x.qk),
totalPurchasedItems = purchasedItems.Count,
totalGiftedItems = giftedItems.Count,
totalExperienceItems = experienceItems.Count,
totalHealthTeachers = healthTeacherData.GroupBy(x => x.jks).Count()
},
// 详细记录列表
records = detailedRecords
},
message = "获取开单记录汇总信息成功"
};
return result;
}
catch (Exception ex)
{
throw NCCException.Oh($"获取开单记录汇总信息失败:{ex.Message}");
}
}
#endregion
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
|
#region 私有方法
/// <summary>
/// 检查开单记录是否可以操作
/// </summary>
/// <param name="billingId">开单记录ID</param>
/// <returns>是否可以作废</returns>
private async Task<(bool canCancel, string errorMessage)> CheckBillingCanCancelAsync(string billingId)
{
try
{
// 查询开单记录
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == billingId);
if (entity == null)
{
return (false, "开单记录不存在");
}
// 检查是否已经作废
if (entity.IsEffective == StatusEnum.无效.GetHashCode())
{
return (false, "该开单记录已经作废");
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2563
|
// 判断是否有对应的补缴记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2564
|
var qkbjList = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.SupplementBillingId == billingId && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2565
2566
2567
2568
|
if (qkbjList.Any())
{
return (false, "该开单记录有对应的补缴记录,不能进行操作");
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2569
|
// 查询开单记录下的品项明细ID列表
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2570
|
var pxmxIdList = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Glkdbh == billingId && p.IsEffective == StatusEnum.有效.GetHashCode()).Select(p => p.Id).Distinct().ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2571
|
// 判断是否有对应的消耗记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2572
|
var xhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2573
2574
2575
2576
2577
|
if (xhPxmxList.Any())
{
return (false, "该开单记录有对应的消耗记录,不能进行操作");
}
// 判断是否有退卡记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2578
|
var hytkMxList = await _db.Queryable<LqHytkMxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2579
2580
2581
2582
2583
|
if (hytkMxList.Any())
{
return (false, "该开单记录有对应的退卡记录,不能进行操作");
}
// 判断是否已经有储扣记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2584
|
var deductInfoList = await _db.Queryable<LqKdDeductinfoEntity>().Where(p => pxmxIdList.Contains(p.DeductId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
|
if (deductInfoList.Any())
{
return (false, "该开单记录有对应的储扣记录,不能进行操作");
}
return (true, string.Empty);
}
catch (Exception ex)
{
return (false, $"检查开单记录状态失败: {ex.Message}");
}
}
#endregion
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
2598
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2599
2600
2601
2602
2603
2604
2605
2606
|
#region 会员转卡操作
/// <summary>
/// 会员转卡操作
/// </summary>
/// <remarks>
/// 转卡是指一个会员把自己剩余的某些品项,转给另外一个会员
/// 转卡会员转出的品项,就做退卡操作
/// 被转卡会员收到的品项,做开卡操作
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2607
|
/// 系统会自动从原开单记录中获取健康师和科技部老师的业绩数据
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2608
2609
2610
2611
2612
2613
2614
|
///
/// 示例请求:
/// ```json
/// {
/// "fromMemberId": "member001",
/// "toMemberId": "member002",
/// "storeId": "store001",
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2615
2616
|
/// "signatureFile": "base64签名数据",
/// "remarks": "转卡备注信息",
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2617
2618
|
/// "transferItems": [
/// {
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2619
|
/// "billingItemId": "pxmx001",
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2620
|
/// "transferQuantity": 5,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2621
2622
|
/// "itemName": "美容项目A",
/// "itemPrice": 100.00
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2623
2624
2625
2626
2627
2628
|
/// }
/// ]
/// }
/// ```
///
/// 参数说明:
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
|
/// - fromMemberId: 转出会员ID(必填)
/// - toMemberId: 转入会员ID(必填)
/// - storeId: 门店ID(必填)
/// - signatureFile: 转出会员签名文件(必填)
/// - remarks: 转卡备注信息(可选)
/// - transferItems: 转出品项列表(必填)
/// - billingItemId: 开单品项明细ID(必填)
/// - transferQuantity: 转出数量(必填,大于0)
/// - itemName: 品项名称(必填)
/// - itemPrice: 品项价格(必填,大于等于0)
///
/// 业务规则:
/// - 转出和转入会员必须存在且有效
/// - 转出品项的剩余数量必须足够
/// - 系统会自动从原开单记录中获取健康师和科技部老师业绩数据
/// - 转卡操作会同时创建退卡记录和开卡记录
/// - 所有操作在事务中执行,确保数据一致性
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
|
/// </remarks>
/// <param name="input">转卡输入参数</param>
/// <returns>转卡结果</returns>
/// <response code="200">转卡成功</response>
/// <response code="400">参数错误或业务规则验证失败</response>
/// <response code="500">服务器错误</response>
[HttpPost("TransferCard")]
public async Task<TransferCardOutput> TransferCard([FromBody] TransferCardInput input)
{
if (input == null)
{
throw NCCException.Oh("转卡参数不能为空");
}
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2659
2660
|
var userInfo = await _userManager.GetUserInfo();
var transferTime = DateTime.Now;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2661
2662
2663
2664
|
try
{
// 开启事务
_db.BeginTran();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
|
// 1. 验证转出和转入会员是否存在
var fromMember = await _db.Queryable<LqKhxxEntity>().Where(x => x.Id == input.FromMemberId && x.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (fromMember == null)
{
throw NCCException.Oh("转出会员不存在或已失效");
}
var toMember = await _db.Queryable<LqKhxxEntity>().Where(x => x.Id == input.ToMemberId && x.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (toMember == null)
{
throw NCCException.Oh("转入会员不存在或已失效");
}
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2676
2677
2678
2679
2680
2681
2682
2683
|
// 2. 验证转出品项的余额是否足够
foreach (var item in input.TransferItems)
{
var billingItem = await _db.Queryable<LqKdPxmxEntity>().Where(x => x.Id == item.BillingItemId && x.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (billingItem == null)
{
throw NCCException.Oh($"品项明细不存在:{item.ItemName}");
}
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
|
// 查询剩余数量
var remainingCount = await GetItemRemainingCount(item.BillingItemId);
if (remainingCount < item.TransferQuantity)
{
throw NCCException.Oh($"品项 {item.ItemName} 剩余数量不足,当前剩余:{remainingCount},需要转出:{item.TransferQuantity}");
}
}
// 3. 创建退卡记录(转出方)
var refundId = YitIdHelper.NextId().ToString();
|
63df7ccb
“wangming”
1
|
2694
|
var totalRefundAmount = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity);
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2695
|
var StoreEntity = await _db.Queryable<LqMdxxEntity>().Where(p => p.Id == input.StoreId).FirstAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
|
var refundEntity = new LqHytkHytkEntity
{
Id = refundId,
F_CreateTime = transferTime,
F_CreateUser = userInfo.userId,
IsEffective = StatusEnum.有效.GetHashCode(),
Czry = userInfo.userId,
Hy = input.FromMemberId,
Hymc = fromMember.Khmc,
Md = input.StoreId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2706
2707
|
Mdmc = StoreEntity.Dm,
Mdbh = StoreEntity.Mdbm,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2708
|
SignatureFile = input.SignatureFile,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2709
2710
2711
|
Hyzh = input.FromMemberId,
Gklx = fromMember.Khlx,
Tksj = DateTime.Now,
|
63df7ccb
“wangming”
1
|
2712
2713
|
Tkje = totalRefundAmount,
ActualRefundAmount = totalRefundAmount, // 转卡时实退金额等于退卡总金额
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2714
2715
2716
2717
2718
2719
2720
2721
|
Tkyy = "转卡",
Bz = $"转卡给会员:{toMember.Khmc},{input.Remarks}"
};
await _db.Insertable(refundEntity).ExecuteCommandAsync();
// 4. 创建退卡品项明细和业绩记录
var refundMxEntities = new List<LqHytkMxEntity>();
var refundJksyjEntities = new List<LqHytkJksyjEntity>();
|
63df7ccb
“wangming”
1
|
2722
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2723
2724
2725
2726
|
var refundKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
foreach (var item in input.TransferItems)
{
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2727
|
var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
|
63df7ccb
“wangming”
1
|
2728
|
//计算品项扣除总金额
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2729
|
var totalItemDeduction = item.ItemPrice * item.TransferQuantity;
|
63df7ccb
“wangming”
1
|
2730
|
//保存退卡明细表
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2731
2732
2733
2734
2735
|
var refundMxEntity = new LqHytkMxEntity
{
Id = YitIdHelper.NextId().ToString(),
RefundInfoId = refundId,
BillingItemId = item.BillingItemId,
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
2736
|
MemberId = input.FromMemberId, // 转卡时使用转出方会员ID
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2737
2738
|
CreateTime = transferTime,
CreateUser = userInfo.userId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2739
|
Px = refundPxmxEntity.Px,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2740
2741
|
Pxmc = item.ItemName,
Pxjg = item.ItemPrice,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2742
|
Tkje = totalItemDeduction,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2743
|
ProjectNumber = item.TransferQuantity,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2744
2745
|
SourceType = refundPxmxEntity.SourceType,
TotalPrice = totalItemDeduction,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2746
2747
2748
|
IsEffective = StatusEnum.有效.GetHashCode()
};
refundMxEntities.Add(refundMxEntity);
|
63df7ccb
“wangming”
1
|
2749
2750
2751
|
var refundKdyjEntities = _db.Queryable<LqKdJksyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
//保存退卡健康师业绩表
foreach (var jks in refundKdyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2752
|
{
|
63df7ccb
“wangming”
1
|
2753
2754
|
//获取健康师当月金三角id
var monthString = DateTime.Now.ToString("yyyyMM");
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2755
2756
2757
2758
2759
2760
|
var GetMonTeamResult = await _db.Queryable<LqJinsanjiaoUserEntity>().Where(p => p.UserId == jks.Jkszh && p.Month == monthString).ToListAsync();
var GetMonTeam = GetMonTeamResult.FirstOrDefault();
if (GetMonTeam == null)
{
throw NCCException.Oh($"健康师 {jks.Jksxm} 在 {monthString} 月份的金三角团队中不存在,请先配置金三角团队信息");
}
|
63df7ccb
“wangming”
1
|
2761
2762
|
//获取本月
refundJksyjEntities.Add(new LqHytkJksyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2763
|
{
|
63df7ccb
“wangming”
1
|
2764
2765
|
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
|
5dc762df
“wangming”
Enhance performan...
|
2766
|
Jks = jks.Jkszh,
|
63df7ccb
“wangming”
1
|
2767
2768
|
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2769
|
Jksyj = (totalItemDeduction / refundKdyjEntities.Count()),
|
63df7ccb
“wangming”
1
|
2770
2771
2772
2773
2774
2775
2776
2777
2778
|
Tksj = DateTime.Now,
F_jsjid = GetMonTeam.JsjId,
F_tkpxid = refundMxEntity.Id,
F_tkpxNumber = item.TransferQuantity,
F_CreateTime = transferTime,
F_CreateUser = userInfo.userId,
CardReturn = refundMxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2779
|
}
|
63df7ccb
“wangming”
1
|
2780
2781
|
//查询科技部老师的业绩
var TechTeacherEntities = _db.Queryable<LqKdKjbsyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2782
|
// 创建退卡科技部老师业绩记录
|
63df7ccb
“wangming”
1
|
2783
|
foreach (var kjbs in TechTeacherEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2784
|
{
|
63df7ccb
“wangming”
1
|
2785
|
refundKjbsyjEntities.Add(new LqHytkKjbsyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2786
|
{
|
63df7ccb
“wangming”
1
|
2787
2788
2789
2790
2791
|
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2792
|
Kjblsyj = (totalItemDeduction / TechTeacherEntities.Count()),
|
63df7ccb
“wangming”
1
|
2793
2794
2795
2796
2797
2798
2799
2800
2801
|
Tksj = transferTime,
F_tkpxid = refundMxEntity.Id,
F_LaborCost = kjbs.LaborCost,
F_tkpxNumber = item.TransferQuantity,
F_CreateTime = transferTime,
F_CreateUser = userInfo.userId,
CardReturn = refundMxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
|
}
}
await _db.Insertable(refundMxEntities).ExecuteCommandAsync();
if (refundJksyjEntities.Any())
{
await _db.Insertable(refundJksyjEntities).ExecuteCommandAsync();
}
if (refundKjbsyjEntities.Any())
{
await _db.Insertable(refundKjbsyjEntities).ExecuteCommandAsync();
}
// 5. 创建开卡记录(转入方)
var billingId = YitIdHelper.NextId().ToString();
var billingEntity = new LqKdKdjlbEntity
{
Id = billingId,
CreateTime = transferTime,
UpdateTime = transferTime,
IsEffective = StatusEnum.有效.GetHashCode(),
CreateUser = userInfo.userId,
Kdhy = input.ToMemberId,
Djmd = input.StoreId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2826
2827
|
Kdrq = DateTime.Now,
Gjlx = toMember.Khlx,
|
63df7ccb
“wangming”
1
|
2828
2829
|
Fkfs = "转卡",
Sfskdd = "否",
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2830
|
Zdyj = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
|
Sfyj = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
Bz = $"从会员 {fromMember.Khmc} 转入,{input.Remarks}"
};
await _db.Insertable(billingEntity).ExecuteCommandAsync();
// 6. 创建开单品项明细和业绩记录
var billingPxmxEntities = new List<LqKdPxmxEntity>();
var billingJksyjEntities = new List<LqKdJksyjEntity>();
var billingKjbsyjEntities = new List<LqKdKjbsyjEntity>();
foreach (var item in input.TransferItems)
{
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2842
|
var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2843
2844
2845
2846
|
var billingPxmxEntity = new LqKdPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2847
|
Px = refundPxmxEntity.Px,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2848
2849
2850
2851
2852
2853
|
Pxmc = item.ItemName,
Pxjg = item.ItemPrice,
MemberId = input.ToMemberId,
CreateTIme = transferTime,
ProjectNumber = item.TransferQuantity,
IsEnabled = StatusEnum.有效.GetHashCode(),
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2854
|
SourceType = refundPxmxEntity.SourceType,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2855
2856
2857
2858
2859
2860
2861
|
TotalPrice = item.ItemPrice * item.TransferQuantity,
ActualPrice = item.ItemPrice * item.TransferQuantity,
IsEffective = StatusEnum.有效.GetHashCode(),
Remark = $"从会员 {fromMember.Khmc} 转入"
};
billingPxmxEntities.Add(billingPxmxEntity);
|
63df7ccb
“wangming”
1
|
2862
|
foreach (var jks in refundJksyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2863
|
{
|
63df7ccb
“wangming”
1
|
2864
|
billingJksyjEntities.Add(new LqKdJksyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2865
|
{
|
63df7ccb
“wangming”
1
|
2866
2867
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
|
5dc762df
“wangming”
Enhance performan...
|
2868
|
Jks = jks.Jkszh,
|
63df7ccb
“wangming”
1
|
2869
2870
2871
2872
2873
2874
2875
2876
|
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
Jksyj = jks.Jksyj.ToString(),
Yjsj = transferTime,
Jsj_id = jks.F_jsjid,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2877
2878
|
}
|
63df7ccb
“wangming”
1
|
2879
|
foreach (var kjbs in refundKjbsyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2880
|
{
|
63df7ccb
“wangming”
1
|
2881
|
billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2882
|
{
|
63df7ccb
“wangming”
1
|
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
Kjblsyj = kjbs.Kjblsyj.ToString(),
Yjsj = transferTime,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2893
2894
|
}
}
|
5b462535
“wangming”
1111
|
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
|
//记录转卡日志
var transferLogEntity = new LqCardTransferLogEntity
{
Id = YitIdHelper.NextId().ToString(),
RefundCardId = refundId,
BillingCardId = billingId,
TransferFromMemberId = input.FromMemberId,
TransferToMemberId = input.ToMemberId,
TransferAmount = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
TransferTime = transferTime,
OperatorId = userInfo.userId,
Remarks = input.Remarks,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode()
};
await _db.Insertable(transferLogEntity).ExecuteCommandAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
|
await _db.Insertable(billingPxmxEntities).ExecuteCommandAsync();
if (billingJksyjEntities.Any())
{
await _db.Insertable(billingJksyjEntities).ExecuteCommandAsync();
}
if (billingKjbsyjEntities.Any())
{
await _db.Insertable(billingKjbsyjEntities).ExecuteCommandAsync();
}
// 提交事务
_db.CommitTran();
return new TransferCardOutput
{
Success = true,
TransferId = refundId,
RefundId = refundId,
BillingId = billingId,
TotalAmount = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
TotalQuantity = input.TransferItems.Sum(x => x.TransferQuantity),
FromMemberName = fromMember.Khmc,
ToMemberName = toMember.Khmc,
TransferTime = transferTime,
Message = "转卡操作成功"
};
}
catch (Exception ex)
{
_db.RollbackTran();
_logger.LogError(ex, "转卡操作失败:{Message}", ex.Message);
throw NCCException.Oh($"转卡操作失败:{ex.Message}");
}
}
#endregion
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
|
#region 获取品项剩余数量
/// <summary>
/// 获取品项剩余数量
/// </summary>
/// <param name="billingItemId">开单品项明细ID</param>
/// <returns>剩余数量</returns>
private async Task<int> GetItemRemainingCount(string billingItemId)
{
try
{
// 查询购买数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2959
2960
2961
2962
|
var purchasedCount = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => x.Id == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
.SumAsync(x => x.ProjectNumber);
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2963
|
// 查询消费数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2964
2965
|
var consumedCount = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => x.BillingItemId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
|
a52c7842
“wangming”
更新服务类:LqKdKdjlbSe...
|
2966
|
.SumAsync(x => x.OriginalProjectNumber);
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2967
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2968
|
// 查询退卡数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2969
2970
2971
2972
|
var refundedCount = await _db.Queryable<LqHytkMxEntity>()
.Where(x => x.BillingItemId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
.SumAsync(x => x.ProjectNumber);
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2973
|
// 查询储扣数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2974
2975
2976
2977
|
var deductCount = await _db.Queryable<LqKdDeductinfoEntity>()
.Where(x => x.DeductId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
.SumAsync(x => x.ProjectNumber) ?? 0;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
|
// 计算剩余数量
var remainingCount = (int)(purchasedCount - consumedCount - refundedCount - deductCount);
return Math.Max(0, remainingCount); // 确保不为负数
}
catch (Exception ex)
{
_logger.LogError(ex, "获取品项剩余数量失败,品项ID:{BillingItemId}", billingItemId);
throw NCCException.Oh($"获取品项剩余数量失败:{ex.Message}");
}
}
#endregion
|
68b8deb5
“wangming”
123213
|
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
|
#region 门店整体统计表
/// <summary>
/// 门店整体统计表
/// </summary>
/// <remarks>
/// 统计每个健康师在指定时间周期内的各项数据指标
/// 包括:邀约人数、预约人数、到店人数、开单人数、开单金额、消耗金额、人头、人次、消耗项目数
///
/// 示例请求:
/// ```json
/// {
/// "startTime": "2025-10-01",
/// "endTime": "2025-10-31",
/// "departmentId": "部门ID",
/// "storeId": "门店ID",
/// "employeeName": "健康师姓名"
/// }
/// ```
///
/// 参数说明:
/// - startTime: 开始时间(可选,默认为当月1号)
/// - endTime: 结束时间(可选,默认为当前时间)
/// - departmentId: 事业部ID(可选)
/// - storeId: 门店ID(可选)
/// - employeeName: 健康师姓名(可选)
///
/// 返回字段说明:
/// - EmployeeId: 健康师ID
/// - EmployeeName: 健康师姓名
/// - StoreId: 门店ID
/// - StoreName: 门店名称
/// - DepartmentId: 事业部ID
/// - DepartmentName: 事业部名称
/// - InviteCount: 邀约人数(按客户去重)
/// - AppointmentCount: 预约人数(按客户去重,无论预约状态)
/// - VisitCount: 到店人数(按客户去重,仅统计状态为'已确认'的预约)
/// - BillingCount: 开单人数(按开单记录去重)
/// - BillingAmount: 开单金额(开单业绩总金额)
/// - ConsumeAmount: 消耗金额(消耗业绩总金额)
/// - HeadCount: 人头(按客户去重)
/// - PersonCount: 人次(按客户+日期去重,同一客户不同天算多次)
/// - ProjectCount: 消耗项目数(项目总次数)
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>健康师统计数据列表</returns>
/// <response code="200">成功返回统计数据</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器错误</response>
[HttpGet("get-health-coach-statistics")]
public async Task<dynamic> GetHealthCoachStatistics([FromQuery] HealthCoachStatisticsQueryInput input)
{
try
{
// 设置默认时间范围(如果未提供,默认为当月)
var startTime = input.StartTime ?? new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
var endTime = input.EndTime ?? DateTime.Now;
// 构建SQL查询
var sql = $@"
SELECT
u.F_Id as EmployeeId,
u.F_REALNAME as EmployeeName,
u.F_MDID as StoreId,
md.dm as StoreName,
md.syb as DepartmentId,
dept.F_FullName as DepartmentName,
-- 邀约人数
COALESCE(invite_stats.InviteCount, 0) as InviteCount,
-- 预约人数(无论状态)
COALESCE(appointment_stats.AppointmentCount, 0) as AppointmentCount,
-- 到店人数(已确认状态)
COALESCE(visit_stats.VisitCount, 0) as VisitCount,
-- 开单人数和金额
COALESCE(billing_stats.BillingCount, 0) as BillingCount,
COALESCE(billing_stats.BillingAmount, 0) as BillingAmount,
-- 消耗相关统计
COALESCE(consume_stats.ConsumeAmount, 0) as ConsumeAmount,
COALESCE(consume_stats.HeadCount, 0) as HeadCount,
COALESCE(consume_stats.PersonCount, 0) as PersonCount,
|
9825c841
“wangming”
修复健康师统计和科技部老师统计问题...
|
3074
|
CAST(COALESCE(consume_stats.ProjectCount, 0) AS DECIMAL(18,2)) as ProjectCount
|
68b8deb5
“wangming”
123213
|
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
|
FROM BASE_USER u
LEFT JOIN lq_mdxx md ON u.F_MDID = md.F_Id
LEFT JOIN base_organize dept ON md.syb = dept.F_Id
-- 邀约统计子查询
LEFT JOIN (
SELECT
yyr as EmployeeId,
COUNT(DISTINCT yykh) as InviteCount
FROM lq_yaoyjl
WHERE yyr IS NOT NULL
AND F_CreateTime >= @startTime
AND F_CreateTime <= @endTime
GROUP BY yyr
) invite_stats ON u.F_Id = invite_stats.EmployeeId
-- 预约统计子查询
LEFT JOIN (
SELECT
yyr as EmployeeId,
COUNT(DISTINCT gk) as AppointmentCount
FROM lq_yyjl
WHERE yyr IS NOT NULL
AND F_CreateTime >= @startTime
AND F_CreateTime <= @endTime
GROUP BY yyr
) appointment_stats ON u.F_Id = appointment_stats.EmployeeId
-- 到店统计子查询
LEFT JOIN (
SELECT
yyr as EmployeeId,
COUNT(DISTINCT gk) as VisitCount
FROM lq_yyjl
WHERE yyr IS NOT NULL
AND F_Status = '已确认'
AND F_CreateTime >= @startTime
AND F_CreateTime <= @endTime
GROUP BY yyr
) visit_stats ON u.F_Id = visit_stats.EmployeeId
-- 开单统计子查询
LEFT JOIN (
SELECT
jkszh as EmployeeId,
COUNT(DISTINCT glkdbh) as BillingCount,
SUM(CAST(jksyj AS DECIMAL(18,2))) as BillingAmount
FROM lq_kd_jksyj
WHERE jkszh IS NOT NULL
AND F_IsEffective = 1
AND yjsj >= @startTime
AND yjsj <= @endTime
GROUP BY jkszh
) billing_stats ON u.F_Id = billing_stats.EmployeeId
-- 消耗统计子查询
LEFT JOIN (
SELECT
jksyj.jkszh as EmployeeId,
SUM(jksyj.jksyj) as ConsumeAmount,
COUNT(DISTINCT hyhk.hy) as HeadCount,
COUNT(DISTINCT CONCAT(jksyj.jkszh, '_', hyhk.hy, '_', DATE(hyhk.hksj))) as PersonCount,
|
9825c841
“wangming”
修复健康师统计和科技部老师统计问题...
|
3138
|
CAST(SUM(jksyj.F_kdpxNumber) AS DECIMAL(18,2)) as ProjectCount
|
68b8deb5
“wangming”
123213
|
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
|
FROM lq_xh_jksyj jksyj
INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
WHERE jksyj.jkszh IS NOT NULL
AND jksyj.F_IsEffective = 1
AND hyhk.F_IsEffective = 1
AND hyhk.hksj >= @startTime
AND hyhk.hksj <= @endTime
GROUP BY jksyj.jkszh
) consume_stats ON u.F_Id = consume_stats.EmployeeId
WHERE u.F_GW = '健康师'
";
// 添加条件过滤
var conditions = new List<string>();
var parameters = new List<SugarParameter>
{
new SugarParameter("@startTime", startTime),
new SugarParameter("@endTime", endTime)
};
if (!string.IsNullOrEmpty(input.DepartmentId))
{
conditions.Add("md.syb = @departmentId");
parameters.Add(new SugarParameter("@departmentId", input.DepartmentId));
}
if (!string.IsNullOrEmpty(input.StoreId))
{
conditions.Add("u.F_MDID = @storeId");
parameters.Add(new SugarParameter("@storeId", input.StoreId));
}
if (!string.IsNullOrEmpty(input.EmployeeName))
{
conditions.Add("u.F_REALNAME LIKE @employeeName");
parameters.Add(new SugarParameter("@employeeName", $"%{input.EmployeeName}%"));
}
if (conditions.Any())
{
sql += " AND " + string.Join(" AND ", conditions);
}
sql += " ORDER BY u.F_REALNAME";
// 执行查询
var allData = await _db.Ado.SqlQueryAsync<HealthCoachStatisticsOutput>(sql, parameters);
// 手动分页
var totalCount = allData.Count;
var pagedData = allData
.Skip((input.currentPage - 1) * input.pageSize)
.Take(input.pageSize)
.ToList();
// 直接返回分页结果
return new
{
list = pagedData,
pagination = new
{
pageIndex = input.currentPage,
pageSize = input.pageSize,
totalCount = totalCount
}
};
}
catch (Exception ex)
{
_logger.LogError(ex, "获取健康师统计数据失败");
throw NCCException.Oh($"获取健康师统计数据失败:{ex.Message}");
}
}
#endregion
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
|
#region 获取开单品项明细记录列表
/// <summary>
/// 获取开单品项明细记录列表(分页)
/// </summary>
/// <remarks>
/// 查询开单品项明细记录,支持多条件筛选和分页查询。采用先分页后关联的查询方式,确保分页准确性和查询性能。
///
/// 示例请求:
/// ```json
/// {
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "yjsj",
/// "sort": "DESC",
/// "Id": "品项明细ID",
/// "BillingId": "开单ID",
/// "StartBillingTime": "2025-01-01",
/// "EndBillingTime": "2025-12-31",
/// "ActivityId": "营销活动ID",
/// "MemberId": "会员ID",
/// "MemberName": "会员名称",
/// "MemberPhone": "会员手机号",
/// "ItemId": "品项ID",
/// "ItemName": "品项名称",
/// "ItemType": "品项类型",
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3240
3241
|
/// "SourceType": "来源类型",
/// "StoreId": "门店ID"
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
|
/// }
/// ```
///
/// 查询参数说明:
/// - currentPage: 当前页码(必填,从1开始)
/// - pageSize: 每页数量(必填)
/// - sidx: 排序字段(可选,默认:yjsj,支持:id、billingId、billingTime、itemName、actualPrice、projectNumber等)
/// - sort: 排序方式(可选,默认:DESC,支持:ASC、DESC)
/// - Id: 品项明细ID(可选,精确匹配)
/// - BillingId: 开单ID(可选,精确匹配)
/// - StartBillingTime: 开单时间开始(可选,格式:yyyy-MM-dd,与EndBillingTime同时使用)
/// - EndBillingTime: 开单时间结束(可选,格式:yyyy-MM-dd,与StartBillingTime同时使用)
/// - ActivityId: 营销活动ID(可选,精确匹配)
/// - MemberId: 会员ID(可选,精确匹配)
/// - MemberName: 会员名称(可选,模糊查询)
/// - MemberPhone: 会员手机号(可选,精确匹配)
/// - ItemId: 品项ID(可选,精确匹配)
/// - ItemName: 品项名称(可选,模糊查询)
/// - ItemType: 品项类型(可选,精确匹配,对应项目资料表的qt2字段)
/// - SourceType: 来源类型(可选,精确匹配,如:购买、赠送、体验)
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3262
|
/// - StoreId: 门店ID(可选,精确匹配,根据开单记录表的门店ID筛选)
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
|
///
/// 返回数据结构:
/// ```json
/// {
/// "pagination": {
/// "pageIndex": 1,
/// "pageSize": 10,
/// "total": 100
/// },
/// "list": [
/// {
/// "id": "品项明细ID",
/// "billingId": "开单ID",
/// "billingTime": "2025-11-15T10:00:00",
/// "activityName": "营销活动名称",
/// "memberName": "会员名称",
/// "memberPhone": "会员手机号",
/// "itemName": "品项名称",
/// "itemType": "品项类型",
/// "actualPrice": 500.00,
/// "projectNumber": 5.0,
/// "sourceType": "购买",
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3285
3286
3287
|
/// "remark": "备注",
/// "storeId": "门店ID",
/// "storeName": "门店名称"
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
|
/// }
/// ]
/// }
/// ```
///
/// 返回字段说明:
/// - id: 品项明细ID(主键)
/// - billingId: 开单ID(关联开单记录表)
/// - billingTime: 开单时间(业绩时间yjsj,DateTime格式)
/// - activityName: 营销活动名称(关联营销活动表)
/// - memberName: 会员名称(关联会员表)
/// - memberPhone: 会员手机号(关联会员表)
/// - itemName: 品项名称(品项明细表字段)
/// - itemType: 品项类型(关联项目资料表的qt2字段)
/// - actualPrice: 实付金额(decimal类型)
/// - projectNumber: 项目次数(decimal类型,支持小数)
/// - sourceType: 来源类型(字符串,如:购买、赠送、体验)
/// - remark: 备注(字符串)
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3306
3307
|
/// - storeId: 门店ID(关联开单记录表的门店ID)
/// - storeName: 门店名称(关联门店表的店名字段)
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
|
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>开单品项明细记录列表(分页)</returns>
/// <response code="200">查询成功,返回开单品项明细记录列表</response>
/// <response code="400">参数错误,如页码或页大小无效</response>
/// <response code="500">服务器错误,查询过程中发生异常</response>
[HttpGet("billing-item-detail-list")]
public async Task<dynamic> GetBillingItemDetailList([FromQuery] BillingItemDetailListQueryInput input)
{
try
{
var sidx = input.sidx == null ? "yjsj" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
// 处理开单时间范围
List<string> queryBillingTime = null;
DateTime? startBillingTime = null;
DateTime? endBillingTime = null;
if (!string.IsNullOrEmpty(input.StartBillingTime) && !string.IsNullOrEmpty(input.EndBillingTime))
{
queryBillingTime = new List<string> { input.StartBillingTime, input.EndBillingTime };
startBillingTime = Ext.GetDateTime(queryBillingTime.First());
endBillingTime = Ext.GetDateTime(queryBillingTime.Last());
}
// 优化查询:先分页查询主表,再批量查询关联数据,避免子查询性能问题
// 1. 先构建基础查询条件
var baseQuery = _db.Queryable<LqKdPxmxEntity>()
.Where(pxmx => pxmx.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(!string.IsNullOrEmpty(input.Id), pxmx => pxmx.Id == input.Id)
.WhereIF(!string.IsNullOrEmpty(input.BillingId), pxmx => pxmx.Glkdbh == input.BillingId)
.WhereIF(queryBillingTime != null && startBillingTime.HasValue, pxmx => pxmx.Yjsj >= new DateTime(startBillingTime.Value.Year, startBillingTime.Value.Month, startBillingTime.Value.Day, 0, 0, 0))
.WhereIF(queryBillingTime != null && endBillingTime.HasValue, pxmx => pxmx.Yjsj <= new DateTime(endBillingTime.Value.Year, endBillingTime.Value.Month, endBillingTime.Value.Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.ActivityId), pxmx => pxmx.ActivityId == input.ActivityId)
.WhereIF(!string.IsNullOrEmpty(input.MemberId), pxmx => pxmx.MemberId == input.MemberId)
.WhereIF(!string.IsNullOrEmpty(input.ItemId), pxmx => pxmx.Px == input.ItemId)
.WhereIF(!string.IsNullOrEmpty(input.ItemName), pxmx => pxmx.Pxmc != null && pxmx.Pxmc.Contains(input.ItemName))
.WhereIF(!string.IsNullOrEmpty(input.SourceType), pxmx => pxmx.SourceType == input.SourceType);
// 2. 通过 EXISTS 子查询筛选关联字段(在分页前筛选,确保分页准确)
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3348
3349
|
baseQuery = baseQuery.WhereIF(!string.IsNullOrEmpty(input.MemberName), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Khmc != null && x.Khmc.Contains(input.MemberName)).Any())
.WhereIF(!string.IsNullOrEmpty(input.MemberPhone), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Sjh == input.MemberPhone).Any())
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3350
3351
|
.WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => SqlFunc.Subqueryable<LqXmzlEntity>().Where(x => x.Id == pxmx.Px && x.Fl4 == input.ItemType).Any())
.WhereIF(!string.IsNullOrEmpty(input.StoreId), pxmx => SqlFunc.Subqueryable<LqKdKdjlbEntity>().Where(x => x.Id == pxmx.Glkdbh && x.Djmd == input.StoreId).Any());
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3352
3353
|
// 3. 先分页查询主表数据(查询实体类,提高性能)
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3354
|
var pagedData = await baseQuery.OrderBy(sidx + " " + sort).ToPagedListAsync(input.currentPage, input.pageSize);
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3355
3356
3357
3358
3359
3360
|
// 4. 批量查询关联数据
var itemIds = pagedData.list.Select(x => x.Id).ToList();
var memberIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.MemberId)).Select(x => x.MemberId).Distinct().ToList();
var activityIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.ActivityId)).Select(x => x.ActivityId).Distinct().ToList();
var projectIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.Px)).Select(x => x.Px).Distinct().ToList();
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3361
|
var billingIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.Glkdbh)).Select(x => x.Glkdbh).Distinct().ToList();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3362
3363
3364
3365
3366
|
// 批量查询会员信息
var memberDict = new Dictionary<string, (string Name, string Phone)>();
if (memberIds.Any())
{
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3367
|
var members = await _db.Queryable<LqKhxxEntity>().Where(x => memberIds.Contains(x.Id)).Select(x => new { x.Id, x.Khmc, x.Sjh }).ToListAsync();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3368
3369
3370
3371
3372
3373
3374
|
memberDict = members.ToDictionary(x => x.Id, x => (x.Khmc ?? "", x.Sjh ?? ""));
}
// 批量查询活动信息
var activityDict = new Dictionary<string, string>();
if (activityIds.Any())
{
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3375
|
var activities = await _db.Queryable<LqPackageInfoEntity>().Where(x => activityIds.Contains(x.Id)).Select(x => new { x.Id, x.ActivityName }).ToListAsync();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3376
3377
3378
3379
3380
3381
3382
|
activityDict = activities.ToDictionary(x => x.Id, x => x.ActivityName ?? "");
}
// 批量查询项目资料
var projectDict = new Dictionary<string, string>();
if (projectIds.Any())
{
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3383
|
var projects = await _db.Queryable<LqXmzlEntity>().Where(x => projectIds.Contains(x.Id)).Select(x => new { x.Id, x.Qt2 }).ToListAsync();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3384
3385
3386
|
projectDict = projects.ToDictionary(x => x.Id, x => x.Qt2 ?? "");
}
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
|
// 批量查询开单记录,获取门店ID
var billingStoreDict = new Dictionary<string, string>();
if (billingIds.Any())
{
var billings = await _db.Queryable<LqKdKdjlbEntity>().Where(x => billingIds.Contains(x.Id)).Select(x => new { x.Id, x.Djmd }).ToListAsync();
billingStoreDict = billings.ToDictionary(x => x.Id, x => x.Djmd ?? "");
}
// 批量查询门店信息
var storeDict = new Dictionary<string, string>();
var storeIds = billingStoreDict.Values.Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
if (storeIds.Any())
{
var stores = await _db.Queryable<LqMdxxEntity>().Where(x => storeIds.Contains(x.Id)).Select(x => new { x.Id, x.Dm }).ToListAsync();
storeDict = stores.ToDictionary(x => x.Id, x => x.Dm ?? "");
}
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
|
// 5. 组装返回数据
var resultList = pagedData.list.Select(pxmx => new BillingItemDetailListOutput
{
id = pxmx.Id,
billingId = pxmx.Glkdbh,
billingTime = pxmx.Yjsj,
activityName = pxmx.ActivityId != null && activityDict.ContainsKey(pxmx.ActivityId) ? activityDict[pxmx.ActivityId] : "",
memberName = pxmx.MemberId != null && memberDict.ContainsKey(pxmx.MemberId) ? memberDict[pxmx.MemberId].Name : "",
memberPhone = pxmx.MemberId != null && memberDict.ContainsKey(pxmx.MemberId) ? memberDict[pxmx.MemberId].Phone : "",
itemName = pxmx.Pxmc,
itemType = pxmx.Px != null && projectDict.ContainsKey(pxmx.Px) ? projectDict[pxmx.Px] : "",
actualPrice = pxmx.ActualPrice,
projectNumber = pxmx.ProjectNumber,
sourceType = pxmx.SourceType,
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3418
3419
3420
|
remark = pxmx.Remark,
storeId = pxmx.Glkdbh != null && billingStoreDict.ContainsKey(pxmx.Glkdbh) ? billingStoreDict[pxmx.Glkdbh] : "",
storeName = pxmx.Glkdbh != null && billingStoreDict.ContainsKey(pxmx.Glkdbh) && !string.IsNullOrEmpty(billingStoreDict[pxmx.Glkdbh]) && storeDict.ContainsKey(billingStoreDict[pxmx.Glkdbh]) ? storeDict[billingStoreDict[pxmx.Glkdbh]] : ""
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
|
}).ToList();
// 6. 返回分页结果
var result = new SqlSugarPagedList<BillingItemDetailListOutput>
{
list = resultList,
pagination = pagedData.pagination
};
return PageResult<BillingItemDetailListOutput>.SqlSugarPageResult(result);
}
catch (Exception ex)
{
_logger.LogError(ex, $"获取开单品项明细记录列表失败: {ex.ToString()}");
throw NCCException.Oh(ErrorCode.COM1005, $"获取开单品项明细记录列表失败: {ex.Message}");
}
}
#endregion
|
96009bc9
hexiaodong
hxd
|
3439
3440
|
}
}
|