caf75b4a
“wangming”
feat: 优化开单记录汇总接口,...
|
1
|
using System;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
2
3
4
5
6
7
|
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;
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
50
|
using NCC.Extend.Entitys.lq_hzf;
|
96009bc9
hexiaodong
hxd
|
51
52
53
54
55
56
|
namespace NCC.Extend.LqKdKdjlb
{
/// <summary>
/// 开单记录表服务
/// </summary>
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
57
|
[ApiDescriptionSettings(Tag = "绿纤开单记录表服务", Name = "LqKdKdjlb", Order = 200)]
|
96009bc9
hexiaodong
hxd
|
58
59
60
61
62
63
64
65
66
|
[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...
|
67
68
|
private readonly WeChatBotService _weChatBotService;
private readonly LqKdKdjlbStringGenerator _stringGenerator;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
69
|
private readonly ILogger<LqKdKdjlbService> _logger;
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
70
|
private readonly LqDailyReportService _dailyReportService;
|
96009bc9
hexiaodong
hxd
|
71
72
73
74
75
76
77
78
79
|
/// <summary>
/// 初始化一个<see cref="LqKdKdjlbService"/>类型的新实例
/// </summary>
public LqKdKdjlbService(
ISqlSugarRepository<LqKdKdjlbEntity> lqKdKdjlbRepository,
ISqlSugarRepository<LqKdJksyjEntity> lqKdJksyjRepository,
ISqlSugarRepository<LqKdKjbsyjEntity> lqKdKjbsyjRepository,
ISqlSugarRepository<LqKdPxmxEntity> lqKdPxmxRepository,
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
80
81
|
IUserManager userManager,
WeChatBotService weChatBotService,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
82
|
LqKdKdjlbStringGenerator stringGenerator,
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
83
84
|
ILogger<LqKdKdjlbService> logger,
LqDailyReportService dailyReportService
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
85
|
)
|
96009bc9
hexiaodong
hxd
|
86
|
{
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
87
|
_lqKdKdjlbRepository = lqKdKdjlbRepository;
|
96009bc9
hexiaodong
hxd
|
88
89
90
91
92
|
_db = _lqKdKdjlbRepository.Context;
_lqKdJksyjRepository = lqKdJksyjRepository;
_lqKdKjbsyjRepository = lqKdKjbsyjRepository;
_lqKdPxmxRepository = lqKdPxmxRepository;
_userManager = userManager;
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
93
94
|
_weChatBotService = weChatBotService;
_stringGenerator = stringGenerator;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
95
|
_logger = logger;
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
96
|
_dailyReportService = dailyReportService;
|
96009bc9
hexiaodong
hxd
|
97
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
98
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
99
|
#region 获取开单记录表
|
96009bc9
hexiaodong
hxd
|
100
101
102
|
/// <summary>
/// 获取开单记录表
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
103
104
105
|
/// <remarks>
/// 获取开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 按照开单的完整格式返回数据,不包含汇总信息
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
106
|
///
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
107
108
109
110
111
112
113
114
115
116
117
|
/// 返回数据结构:
/// - 主表信息:开单基础信息、业绩信息、支付信息、会员信息等
/// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
/// - 健康师业绩列表:按品项关联的健康师业绩信息
/// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <returns>开单记录完整信息</returns>
/// <response code="200">查询成功</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
118
119
120
|
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
121
122
123
124
125
126
127
128
|
try
{
// 1. 查询主表信息
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "开单记录不存在");
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
129
|
var output = entity.Adapt<LqKdKdjlbInfoOutput>();
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
130
131
132
|
output.upgradeLifeBeauty = entity.UpgradeLifeBeauty;
output.upgradeTechBeauty = entity.UpgradeTechBeauty;
output.upgradeMedicalBeauty = entity.UpgradeMedicalBeauty;
|
2beedbc2
“wangming”
修复健康师工资额外计算服务接口错误
|
133
|
output.fileUrl = entity.F_FIleUrl;
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
134
135
136
137
|
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查...
|
138
139
140
141
|
if (output.activityId != null)
{
output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
}
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
142
143
144
145
|
//获取会员信息
var MemberInfo = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == entity.Kdhy);
output.kdhyc = MemberInfo.Khmc;
output.kdhysjh = MemberInfo.Sjh;
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
146
|
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
147
148
149
150
|
if (!string.IsNullOrEmpty(entity.ActivityId))
{
output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
151
|
// 2. 查询品项明细列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
152
|
var lqKdPxmxList = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
153
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
154
|
// 3. 查询健康师业绩列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
155
|
var lqKdJksyjList = await _db.Queryable<LqKdJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
156
157
|
// 4. 查询科技部老师业绩列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
158
|
var lqKdKjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
159
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
160
161
162
|
// 5. 查询扣款信息列表
var lqKdDeductList = await _db.Queryable<LqKdDeductinfoEntity>().Where(w => w.BillingId == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
|
// 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文件,优...
|
179
|
totalPrice = pxmx.TotalPrice,
|
bff07b1f
“wangming”
Refactor FileVari...
|
180
|
actualPrice = pxmx.ActualPrice,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
181
|
remark = pxmx.Remark,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
182
|
isEffective = pxmx.IsEffective,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
183
184
185
186
187
188
189
190
191
192
|
};
// 关联该品项的健康师业绩
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”
优化开单记录作废功能:添加详细错误...
|
193
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
194
195
196
197
198
199
200
201
202
|
pxmxOutputList.Add(pxmxOutput);
}
// 6. 设置输出结果
output.lqKdPxmxList = pxmxOutputList;
// 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
output.lqKdJksyjList = lqKdJksyjList.Adapt<List<LqKdJksyjInfoOutput>>();
output.lqKdKjbsyjList = lqKdKjbsyjList.Adapt<List<LqKdKjbsyjInfoOutput>>();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
203
204
|
// 8. 设置扣款信息列表
output.lqKdDeductList = lqKdDeductList.Adapt<List<LqKdDeductinfoInfoOutput>>();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
205
206
207
208
209
210
211
212
|
return output;
}
catch (Exception ex)
{
Console.WriteLine($"获取开单记录失败: {ex.Message}");
throw NCCException.Oh(ErrorCode.COM1000, "获取开单记录失败");
}
|
96009bc9
hexiaodong
hxd
|
213
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
214
|
#endregion
|
96009bc9
hexiaodong
hxd
|
215
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
216
|
#region 获取开单记录表列表
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
217
|
|
96009bc9
hexiaodong
hxd
|
218
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
219
220
221
222
|
/// 获取开单记录表列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
223
224
225
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqKdKdjlbListQueryInput input)
{
|
ed462a62
“wangming”
更新开发环境配置和优化客户信息导入功能
|
226
|
var sidx = input.sidx == null ? "kdrq" : input.sidx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
227
|
List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
228
229
|
DateTime? startKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.First()) : null;
DateTime? endKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.Last()) : null;
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
|
// 根据是否传入健康师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
|
273
274
275
|
.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...
|
276
277
|
.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
|
278
279
|
.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...
|
280
281
282
|
.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
|
283
|
.WhereIF(!string.IsNullOrEmpty(input.ckfs), p => p.Ckfs.Equals(input.ckfs))
|
96009bc9
hexiaodong
hxd
|
284
285
286
287
288
289
290
291
292
293
|
.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...
|
294
|
.WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
295
|
.WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
296
|
.WhereIF(!string.IsNullOrEmpty(input.CreateUser), p => p.CreateUser.Equals(input.CreateUser))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
297
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
298
|
.Select(it => new LqKdKdjlbListOutput
|
96009bc9
hexiaodong
hxd
|
299
300
|
{
id = it.Id,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
301
302
303
304
305
306
307
308
309
|
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”
更新门店目标设定相关功能,新增字段...
|
310
311
312
313
314
|
fkfs = it.Fkfs,
fkyy = it.Fkyy,
fkpd = it.Fkpd,
khly = it.Khly,
tjr = it.Tjr,
|
41da4257
“wangming”
Refactor LqEventS...
|
315
|
deductAmount = it.DeductAmount,
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
316
317
|
paidDebt = it.PaidDebt,
supplementBillingId = it.SupplementBillingId,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
318
319
320
321
|
sfskdd = it.Sfskdd,
jj = it.Jj,
bz = it.Bz,
kdhy = it.Kdhy,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
322
323
|
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: 删除考勤汇总表相关功能...
|
324
325
326
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
327
328
|
activityId = it.ActivityId,
activityName = SqlFunc.Subqueryable<LqPackageInfoEntity>().Where(x => x.Id == it.ActivityId).Select(x => x.ActivityName),
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
329
330
|
appointmentId = it.AppointmentId,
appointmentTime = it.AppointmentId == null ? (DateTime?)null : SqlFunc.Subqueryable<LqYyjlEntity>().Where(x => x.Id == it.AppointmentId).Select(x => SqlFunc.ToDate(x.Yysj)),
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
331
332
333
|
upgradeMedicalBeauty = it.UpgradeMedicalBeauty,
upgradeTechBeauty = it.UpgradeTechBeauty,
upgradeLifeBeauty = it.UpgradeLifeBeauty,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
334
335
336
337
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
338
339
340
|
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
341
342
343
344
|
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
345
|
itemDetails = await _db.Queryable<LqKdPxmxEntity>().Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
|
.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: 添加开单服务根据健康师...
|
370
371
372
373
|
// 批量查询健康师业绩(性能优化:一次性查询所有开单的健康师业绩)
var jksyjList = new List<LqKdJksyjInfoOutput>();
if (billingIds.Any())
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
374
375
376
377
378
379
380
381
382
383
384
385
386
|
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: 添加开单服务根据健康师...
|
387
388
389
390
391
392
|
}
// 批量查询科技部老师业绩(性能优化:一次性查询所有开单的科技部老师业绩)
var kjbsyjList = new List<LqKdKjbsyjInfoOutput>();
if (billingIds.Any())
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
|
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: 添加开单服务根据健康师...
|
414
415
|
{
id = x.Id,
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
416
417
418
419
420
421
422
423
424
425
426
|
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: 添加开单服务根据健康师...
|
427
428
429
430
|
})
.ToListAsync();
}
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
431
432
|
// 按开单ID分组储扣扣款信息
var deductinfoGrouped = deductinfoList.GroupBy(x => x.billingId).ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
433
|
// 按开单ID分组健康师业绩
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
434
|
var jksyjGrouped = jksyjList.GroupBy(x => x.glkdbh).ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
435
|
// 按开单ID分组科技部老师业绩
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
436
|
var kjbsyjGrouped = kjbsyjList.GroupBy(x => x.glkdbh).ToDictionary(g => g.Key, g => g.ToList());
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
437
438
|
// 为每个开单记录分配品项明细、健康师业绩和科技部老师业绩
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
439
440
|
foreach (var item in data.list)
{
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
441
442
443
444
|
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...
|
445
446
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
447
|
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
448
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
449
|
#endregion
|
96009bc9
hexiaodong
hxd
|
450
|
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
|
#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: 添加开单服务根据健康师...
|
487
488
|
var sidx = input.sidx == null ? "kdrq" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
|
// 解析时间范围
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: 退卡服务添加健康师和科...
|
507
|
var data = await _db.Queryable<LqKdJksyjEntity, LqKdKdjlbEntity>((jksyj, kdjlb) => jksyj.Glkdbh == kdjlb.Id)
|
5e629136
“wangming”
feat: 添加开单服务根据健康师...
|
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
|
.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: 添加转化率统计和升单类型功能
|
545
546
|
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: 添加开单服务根据健康师...
|
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
693
694
695
696
697
698
699
700
|
})
.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: 添加转化率统计和升单类型功能
|
701
702
|
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: 添加开单服务根据健康师...
|
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
752
753
754
755
756
757
758
759
|
})
.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”
更新门店目标设定相关功能,新增字段...
|
760
|
#region 新建开单记录表
|
96009bc9
hexiaodong
hxd
|
761
762
763
764
765
766
767
768
769
770
|
/// <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
|
771
|
var HealthInstructorNames = "";
|
96009bc9
hexiaodong
hxd
|
772
|
entity.Id = YitIdHelper.NextId().ToString();
|
d98270e2
“wangming”
Enhance LqEventSe...
|
773
774
|
entity.CreateTime = DateTime.Now;
entity.UpdateTime = DateTime.Now;
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
775
|
entity.IsEffective = StatusEnum.有效.GetHashCode();
|
96009bc9
hexiaodong
hxd
|
776
777
778
779
|
try
{
//开启事务
_db.BeginTran();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
780
781
782
783
784
785
786
787
788
789
790
791
|
//判断是否有补缴开单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: 删除考勤汇总表相关功能...
|
792
793
|
supplementBillingEntity.PaidDebt += input.supplementAmount > supplementAmount ? supplementAmount : input.supplementAmount;
await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
794
|
}
|
96009bc9
hexiaodong
hxd
|
795
|
//新增开单记录表记录
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
796
|
entity.CreateUser = userInfo.userId;
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
|
//计算储扣总金额
entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);
//判断升单类型:需要同时满足两个条件
//1. 当前开单包含对应类型的品项
//2. 该会员之前有开单记录(升单的前提)
//批量查询当前开单所有品项的分类(性能优化)
var itemIds = input.lqKdPxmxList?.Where(x => !string.IsNullOrEmpty(x.px)).Select(x => x.px).Distinct().ToList() ?? new List<string>();
var itemCategoryDict = new Dictionary<string, string>();
if (itemIds.Any())
{
var itemCategories = await _db.Queryable<LqXmzlEntity>()
.Where(x => itemIds.Contains(x.Id) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new { x.Id, x.Qt2 })
.ToListAsync();
itemCategoryDict = itemCategories.ToDictionary(k => k.Id, v => v.Qt2 ?? "");
}
//判断当前开单是否包含医美品项
var hasMedicalItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x =>
!string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美");
var MedicalItemInCurrentBillingAmount = input.lqKdPxmxList.Where(x =>
!string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美").Sum(x => x.actualPrice);
//判断当前开单是否包含科美品项
var hasTechItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x =>
!string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "科美");
//判断当前开单是否包含生美品项
var hasLifeItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x =>
!string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "生美");
//判断该会员之前是否有医美类型的开单记录(升医美的前提)
var hasPreviousMedicalBilling = await _db.Queryable<LqKdPxmxEntity>()
.Where(pxmx => pxmx.MemberId == entity.Kdhy
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.ItemCategory == "医美"
&& pxmx.ActualPrice > 0
&& pxmx.Px != "61")
.AnyAsync();
//判断该会员之前是否有科美类型的开单记录(升科美的前提)
var hasPreviousTechBilling = await _db.Queryable<LqKdPxmxEntity>()
.Where(pxmx => pxmx.MemberId == entity.Kdhy
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.ItemCategory == "科美"
&& pxmx.ActualPrice > 0
&& pxmx.Px != "61")
.AnyAsync();
//判断该会员之前是否有生美类型的开单记录(升生美的前提)
var hasPreviousLifeBilling = await _db.Queryable<LqKdPxmxEntity>()
.Where(pxmx => pxmx.MemberId == entity.Kdhy
&& pxmx.IsEffective == StatusEnum.有效.GetHashCode()
&& pxmx.ItemCategory == "生美"
&& pxmx.ActualPrice > 0
&& pxmx.Px != "61")
.AnyAsync();
//判断升医美:当前开单包含医美品项 + 之前有医美类型的开单记录 + 实付业绩>=1000
if (hasMedicalItemInCurrentBilling && hasPreviousMedicalBilling && MedicalItemInCurrentBillingAmount >= 1000)
{
entity.UpgradeMedicalBeauty = "是";
}
else
{
entity.UpgradeMedicalBeauty = "否";
}
//判断升科美:当前开单包含科美品项 + 之前有科美类型的开单记录
if (hasTechItemInCurrentBilling && hasPreviousTechBilling)
{
entity.UpgradeTechBeauty = "是";
}
else
{
entity.UpgradeTechBeauty = "否";
}
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
875
|
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
876
877
878
879
880
881
882
883
884
|
//判断升生美:当前开单包含生美品项 + 之前有生美类型的开单记录
if (hasLifeItemInCurrentBilling && hasPreviousLifeBilling)
{
entity.UpgradeLifeBeauty = "是";
}
else
{
entity.UpgradeLifeBeauty = "否";
}
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
885
|
//保存开单记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
886
|
var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
887
888
889
890
891
|
//循环品相信息
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
|
b45d55f7
“wangming”
Refactor LqEventS...
|
892
893
894
895
896
897
898
899
|
var allDeductEntities = new List<LqKdDeductinfoEntity>();
// 处理扣款信息列表
foreach (var item in input.lqKdKdjlbDeductList)
{
var lqKdDeductEntity = new LqKdDeductinfoEntity
{
Id = YitIdHelper.NextId().ToString(),
BillingId = newEntity.Id,
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
900
|
BillingTime = newEntity.Kdrq, // 设置开单时间
|
b45d55f7
“wangming”
Refactor LqEventS...
|
901
902
903
|
DeductId = item.DeductId,
DeductType = item.DeductType,
Amount = item.Amount,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
904
905
906
907
908
909
|
ProjectNumber = item.ProjectNumber,
UnitPrice = item.UnitPrice,
ItemName = item.ItemName,
ItemId = item.ItemId,
IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
CreateTime = DateTime.Now, // 设置创建时间
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
910
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.ItemId).Select(x => x.Qt2).FirstAsync(),
|
b45d55f7
“wangming”
Refactor LqEventS...
|
911
912
913
|
};
allDeductEntities.Add(lqKdDeductEntity);
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
914
915
|
// 处理品项明细列表
foreach (var item in input.lqKdPxmxList)
|
96009bc9
hexiaodong
hxd
|
916
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
917
918
|
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
|
96009bc9
hexiaodong
hxd
|
919
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
920
921
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
|
dac8767e
“wangming”
111111111
|
922
|
Yjsj = input.kdrq,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
923
924
|
CreateTIme = DateTime.Now,
MemberId = entity.Kdhy,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
925
|
IsEnabled = StatusEnum.有效.GetHashCode(),
|
023505ba
“wangming”
Enhance LqEventSe...
|
926
927
|
ProjectNumber = item.projectNumber,
TotalPrice = (decimal)(item.pxjg * item.projectNumber),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
928
929
930
931
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
|
850bf205
“wangming”
Add ActualPrice f...
|
932
|
ActualPrice = item.actualPrice,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
933
934
|
Remark = item.remark,
IsEffective = StatusEnum.有效.GetHashCode(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
935
|
ActivityId = input.activityId,
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
936
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
937
|
PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
938
|
BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.BeautyType).FirstAsync(),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
939
940
|
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
941
942
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
|
96009bc9
hexiaodong
hxd
|
943
|
{
|
28404662
“wangming”
1111
|
944
|
//把jksxm保存到HealthInstructorNames
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
945
|
foreach (var ijks_tem in item.lqKdJksyjList)
|
06553fb7
“wangming”
1
|
946
|
{
|
28404662
“wangming”
1111
|
947
948
949
950
951
952
953
954
955
956
957
958
|
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: 完善开单欠款补缴记录功能
|
959
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
960
|
ActivityId = input.activityId,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
961
962
|
ItemCategory = lqKdPxmxEntity.ItemCategory,
ItemId = lqKdPxmxEntity.Px,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
963
|
ItemName = lqKdPxmxEntity.Pxmc,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
964
|
StoreId = entity.Djmd,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
965
966
|
PerformanceType = lqKdPxmxEntity.PerformanceType,
BeautyType = lqKdPxmxEntity.BeautyType,
|
28404662
“wangming”
1111
|
967
|
});
|
06553fb7
“wangming”
1
|
968
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
969
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
970
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
971
972
973
974
|
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
|
06553fb7
“wangming”
1
|
975
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
976
977
978
979
980
981
982
983
984
985
986
987
|
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,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
988
989
|
ItemCategory = lqKdPxmxEntity.ItemCategory,
ItemId = lqKdPxmxEntity.Px,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
990
|
ItemName = lqKdPxmxEntity.Pxmc,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
991
|
StoreId = entity.Djmd,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
992
993
|
PerformanceType = lqKdPxmxEntity.PerformanceType,
BeautyType = lqKdPxmxEntity.BeautyType,
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
994
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
995
|
);
|
06553fb7
“wangming”
1
|
996
|
}
|
96009bc9
hexiaodong
hxd
|
997
|
}
|
96009bc9
hexiaodong
hxd
|
998
|
}
|
28404662
“wangming”
1111
|
999
|
|
28404662
“wangming”
1111
|
1000
|
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
1001
|
|
41da4257
“wangming”
Refactor LqEventS...
|
1002
1003
|
//通过会员id查询会员信息
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
|
759f9f27
“wangming”
123321
|
1004
1005
1006
|
//通过开单记录表查询这个会员开单金额
var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
//如果开单金额小于500,为散客,如果大于500,为会员
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1007
|
if (kdAmount < 500 && kdAmount > 0)
|
759f9f27
“wangming”
123321
|
1008
1009
1010
1011
1012
1013
1014
|
{
memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
}
else
{
memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
}
|
41da4257
“wangming”
Refactor LqEventS...
|
1015
|
await _db.Updateable(memberInfo).ExecuteCommandAsync();
|
b45d55f7
“wangming”
Refactor LqEventS...
|
1016
1017
1018
1019
1020
|
// 批量插入扣款信息
if (allDeductEntities.Any())
{
await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
1021
1022
1023
1024
|
// 批量插入品项明细
if (allPxmxEntities.Any())
{
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
|
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1036
1037
|
//关闭事务
_db.CommitTran();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1038
1039
1040
|
// 生成开单记录字符串并发送到企业微信
try
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
1041
1042
|
//判断如果开单金额大于0,则发送开单记录字符串到企业微信
if (newEntity.Sfyj > 0)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1043
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
1044
1045
|
var entityInfo = await GetInfo(newEntity.Id);
if (entityInfo != null)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1046
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
1047
1048
1049
1050
1051
1052
|
var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo, HealthInstructorNames);
Console.WriteLine("开单记录字符串生成成功:");
Console.WriteLine(orderRecordString);
// 发送到企业微信群
try
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1053
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
1054
1055
1056
1057
1058
1059
1060
1061
1062
|
var sendResult = await _weChatBotService.SendOrderRecordMessage(orderRecordString);
if (sendResult)
{
Console.WriteLine("开单记录已成功发送到企业微信群");
}
else
{
Console.WriteLine("开单记录发送到企业微信群失败");
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1063
|
}
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
1064
|
catch (Exception wechatEx)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1065
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
1066
|
Console.WriteLine($"发送企业微信消息异常: {wechatEx.Message}");
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1067
1068
|
}
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1069
1070
1071
1072
1073
1074
1075
|
}
}
catch (Exception ex)
{
// 字符串生成失败不影响主流程,只记录日志
Console.WriteLine($"生成开单记录字符串失败: {ex.Message}");
}
|
6b697cd3
“wangming”
feat: 添加营销活动统计功能(...
|
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
|
// 播报事业部开单统计数据
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”
优化系统功能和性能
|
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
|
}
catch (Exception ex)
{
//回滚事务
_db.RollbackTran();
Console.WriteLine($"开单创建失败: {ex.Message}");
Console.WriteLine($"异常堆栈: {ex.StackTrace}");
throw NCCException.Oh(ErrorCode.COM1000);
}
}
#endregion
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
|
#region 修改开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// <summary>
/// 修改开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// </summary>
/// <remarks>
/// 参数说明:
/// - 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正确设置
try
{
//检查开单记录是否可以操作
var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(id);
if (!canCancel)
{
throw NCCException.Oh(errorMessage);
}
//开启事务
_db.BeginTran();
//查询是否有对应的补缴开单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();
}
//批量查询当前开单所有品项的分类(性能优化)
var itemIds = input.lqKdPxmxList?.Where(x => !string.IsNullOrEmpty(x.px)).Select(x => x.px).Distinct().ToList() ?? new List<string>();
var itemCategoryDict = new Dictionary<string, string>();
if (itemIds.Any())
{
var itemCategories = await _db.Queryable<LqXmzlEntity>()
.Where(x => itemIds.Contains(x.Id) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new { x.Id, x.Qt2 })
.ToListAsync();
itemCategoryDict = itemCategories.ToDictionary(k => k.Id, v => v.Qt2 ?? "");
}
//判断当前开单是否包含医美品项
var hasMedicalItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美");
var MedicalItemInCurrentBillingAmount = input.lqKdPxmxList.Where(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美").Sum(x => x.actualPrice);
//判断当前开单是否包含科美品项
var hasTechItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "科美");
//判断当前开单是否包含生美品项
var hasLifeItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "生美");
//获取该会员之前开单品项里面是否有医美项目
var isMedicalProject = hasMedicalItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "医美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
if (isMedicalProject && MedicalItemInCurrentBillingAmount >= 1000)
{
entity.UpgradeLifeBeauty = "是";
}
else
{
entity.UpgradeLifeBeauty = "否";
}
//获取该会员之前开单品项里面是否有科美项目
var isTechProject = hasTechItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "科美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
if (isTechProject)
{
entity.UpgradeTechBeauty = "是";
}
else
{
entity.UpgradeTechBeauty = "否";
}
//获取该会员之前开单品项里面是否有生美项目
var isLifeProject = hasLifeItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "生美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
if (isLifeProject)
{
entity.UpgradeMedicalBeauty = "是";
}
else
{
entity.UpgradeMedicalBeauty = "否";
}
//计算储扣总金额
entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);
entity.UpdateTime = DateTime.Now;
// 更新开单记录主表
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).IgnoreColumns(x => x.CreateTime).ExecuteCommandAsync();
//清空原有品项明细
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)
{
var lqKdDeductEntity = new LqKdDeductinfoEntity
{
Id = YitIdHelper.NextId().ToString(),
BillingId = id,
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
1247
|
BillingTime = entity.Kdrq, // 设置开单时间
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1248
1249
1250
1251
1252
1253
1254
1255
1256
|
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, // 设置创建时间
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
1257
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.ItemId).Select(x => x.Qt2).FirstAsync() // 修复:使用 ItemId 而不是 DeductId
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
|
};
allDeductEntities.Add(lqKdDeductEntity);
}
// 处理品项明细列表
foreach (var item in input.lqKdPxmxList)
{
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
{
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,
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
1284
|
PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
1285
|
BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.BeautyType).FirstAsync(),
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
|
};
allPxmxEntities.Add(lqKdPxmxEntity);
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
{
//把jksxm保存到HealthInstructorNames
foreach (var ijks_tem in item.lqKdJksyjList)
{
allJksyjEntities.Add(new LqKdJksyjEntity
{
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,
ItemCategory = lqKdPxmxEntity.ItemCategory,
ItemId = lqKdPxmxEntity.Px,
StoreId = entity.Djmd,
ItemName = lqKdPxmxEntity.Pxmc,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
1312
|
PerformanceType = lqKdPxmxEntity.PerformanceType,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
1313
|
BeautyType = lqKdPxmxEntity.BeautyType,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
|
});
}
}
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
{
allKjbsyjEntities.Add(new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
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,
ItemCategory = lqKdPxmxEntity.ItemCategory,
ItemId = lqKdPxmxEntity.Px,
StoreId = entity.Djmd,
ItemName = lqKdPxmxEntity.Pxmc,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
1339
|
PerformanceType = lqKdPxmxEntity.PerformanceType,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
1340
|
BeautyType = lqKdPxmxEntity.BeautyType,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
|
});
}
}
}
//通过会员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();
}
//关闭事务
_db.CommitTran();
}
catch (Exception ex)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh($"创建开单记录失败: {ex.Message}");
}
}
#endregion
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1393
|
#region 获取开单记录表无分页列表
|
96009bc9
hexiaodong
hxd
|
1394
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1395
1396
1397
1398
|
/// 获取开单记录表无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
1399
1400
1401
1402
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqKdKdjlbListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1403
|
List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
1404
1405
1406
1407
1408
1409
|
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...
|
1410
1411
|
.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
|
1412
1413
|
.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...
|
1414
1415
1416
|
.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
|
1417
|
.WhereIF(!string.IsNullOrEmpty(input.ckfs), p => p.Ckfs.Equals(input.ckfs))
|
96009bc9
hexiaodong
hxd
|
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
|
.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...
|
1428
|
.WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1429
|
.WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
1430
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1431
|
.Select(it => new LqKdKdjlbListOutput
|
96009bc9
hexiaodong
hxd
|
1432
1433
|
{
id = it.Id,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1434
1435
1436
1437
1438
1439
1440
1441
1442
|
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...
|
1443
|
deductAmount = it.DeductAmount,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
|
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: 删除考勤汇总表相关功能...
|
1455
|
fileUrl = it.F_FIleUrl,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1456
1457
1458
1459
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1460
|
return data;
|
96009bc9
hexiaodong
hxd
|
1461
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1462
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1463
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1464
|
#region 导出开单记录表
|
96009bc9
hexiaodong
hxd
|
1465
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1466
1467
1468
1469
|
/// 导出开单记录表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
|
[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文件,优...
|
1484
1485
|
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
|
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
|
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...
|
1498
|
excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
|
96009bc9
hexiaodong
hxd
|
1499
1500
1501
1502
1503
|
}
}
var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
ExcelExportHelper<LqKdKdjlbListOutput>.Export(exportData, excelconfig, addPath);
var fileName = _userManager.UserId + "|" + addPath + "|xls";
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1504
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
1505
1506
|
return output;
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1507
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1508
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1509
|
#region 批量删除开单记录表
|
96009bc9
hexiaodong
hxd
|
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
|
/// <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...
|
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
|
// 检查是否有消耗记录
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
|
1541
|
//批量删除开单记录表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1542
|
await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1543
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1544
|
//清空健康师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1545
|
await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1546
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1547
|
//清空科技部老师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1548
|
await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1549
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1550
|
//清空品项明细
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1551
|
await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1552
1553
1554
1555
|
//清空扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().In(u => u.BillingId, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1556
1557
1558
|
//关闭事务
_db.CommitTran();
}
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1559
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
1560
1561
1562
|
{
//回滚事务
_db.RollbackTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1563
|
throw NCCException.Oh($"批量删除开单记录表失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
1564
1565
1566
|
}
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1567
|
#endregion
|
96009bc9
hexiaodong
hxd
|
1568
|
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1569
|
#region 删除开单记录表
|
96009bc9
hexiaodong
hxd
|
1570
|
/// <summary>
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1571
|
/// 删除开单记录表
|
96009bc9
hexiaodong
hxd
|
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
|
/// </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...
|
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
|
//先查询开单品项明细
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”
更新门店目标设定相关功能,新增字段...
|
1603
|
|
96009bc9
hexiaodong
hxd
|
1604
|
//删除开单记录表记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1605
|
await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1606
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1607
|
//清空健康师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1608
|
await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1609
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1610
|
//清空科技部老师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1611
|
await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1612
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1613
|
//清空品项明细
|
c842ad9a
“wangming”
Remove analyze_ex...
|
1614
|
await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1615
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1616
1617
1618
|
//清空扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().Where(u => u.BillingId == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
1619
1620
1621
|
//关闭事务
_db.CommitTran();
}
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1622
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
1623
1624
1625
|
{
//回滚事务
_db.RollbackTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1626
|
throw NCCException.Oh($"删除开单记录表失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
1627
1628
|
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
1629
|
#endregion
|
b45d55f7
“wangming”
Refactor LqEventS...
|
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
|
#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”
对开单加上了是否有效的逻辑,完善了...
|
1649
|
|
5dc762df
“wangming”
Enhance performan...
|
1650
1651
1652
1653
1654
1655
1656
1657
1658
|
#region 获取状态枚举内容(所有的状态通用)
/// <summary>
/// 获取状态枚举内容
/// </summary>
/// <returns>状态枚举列表</returns>
[HttpGet("status-enum")]
public List<EnumOutput> GetStatusEnum()
{
return Enum.GetValues<StatusEnum>()
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1659
|
.Select(e => new EnumOutput
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1660
|
{
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
1661
1662
1663
1664
1665
|
Value = (int)e,
Name = e.ToString(),
Description = e.GetDescription(),
})
.ToList();
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1666
1667
1668
|
}
#endregion
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1669
1670
1671
1672
|
#region 作废开单记录
/// <summary>
/// 作废开单记录
/// </summary>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1673
|
/// <param name="input">作废开单记录输入</param>
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1674
|
/// <returns>无返回值</returns>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
|
/// <remarks>
/// 作废指定的开单记录,包括相关的品项明细、业绩记录等
///
/// 示例请求:
/// ```json
/// {
/// "id": "123456789",
/// "remarks": "客户要求作废此订单"
/// }
/// ```
///
/// 参数说明:
/// - id: 开单记录主键ID(必填)
/// - remarks: 作废备注说明
/// </remarks>
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1690
1691
1692
1693
|
/// <response code="200">作废成功</response>
/// <response code="400">参数错误,开单记录ID不能为空</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1694
1695
|
[HttpPut("Cancel")]
public async Task Cancel(CancelBillingInput input)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1696
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1697
|
if (string.IsNullOrEmpty(input.Id))
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1698
1699
1700
|
{
throw NCCException.Oh("开单记录ID不能为空");
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1701
1702
1703
1704
|
try
{
//开启事务
_db.BeginTran();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1705
1706
1707
1708
1709
1710
|
// 检查开单记录是否可以作废
var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(input.Id);
if (!canCancel)
{
throw NCCException.Oh(errorMessage);
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1711
1712
|
// 查询开单记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1713
|
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.Id);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1714
1715
1716
1717
1718
|
if (entity == null)
{
throw NCCException.Oh("开单记录不存在");
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1719
1720
1721
1722
|
// 标记开单记录为无效,并添加作废备注
entity.IsEffective = StatusEnum.无效.GetHashCode();
entity.CancelRefRemarks = input.Remarks;
entity.UpdateTime = DateTime.Now;
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1723
|
await _db.Updateable(entity).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1724
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1725
|
// 标记对应开单明细表为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1726
|
await _db.Updateable<LqKdPxmxEntity>().SetColumns(it => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1727
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1728
|
// 标记健康师业绩为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1729
|
await _db.Updateable<LqKdJksyjEntity>().SetColumns(it => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1730
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1731
|
// 标记科技部老师业绩为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1732
|
await _db.Updateable<LqKdKjbsyjEntity>().SetColumns(it => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1733
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1734
|
// 标记开单_储扣详细表为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1735
|
await _db.Updateable<LqKdDeductinfoEntity>().SetColumns(it => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.BillingId == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1736
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
|
//如果存在补缴开单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”
对开单加上了是否有效的逻辑,完善了...
|
1747
1748
1749
|
//关闭事务
_db.CommitTran();
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1750
|
catch (Exception ex)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1751
1752
1753
|
{
//回滚事务
_db.RollbackTran();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1754
|
throw NCCException.Oh($"作废开单记录失败: {ex.Message}");
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1755
1756
1757
1758
|
}
}
#endregion
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
|
#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”
优化系统功能和性能
|
1823
1824
1825
1826
1827
|
// 2. 批量处理数据,每批1000条
const int batchSize = 1000;
var totalBatches = (int)Math.Ceiling((double)historyData.Count / batchSize);
for (int batchIndex = 0; batchIndex < totalBatches; batchIndex++)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1828
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1829
|
var batchData = historyData.Skip(batchIndex * batchSize).Take(batchSize).ToList();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1830
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1831
1832
1833
1834
1835
1836
|
var kdjlbEntities = new List<LqKdKdjlbEntity>();
var pxmxEntities = new List<LqKdPxmxEntity>();
foreach (var item in batchData)
{
try
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1837
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
|
// 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”
新增历史会员权益数据导入功能
|
1865
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
|
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”
新增历史会员权益数据导入功能
|
1883
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1884
|
pxmxEntities.Add(pxmxEntity);
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1885
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1886
1887
1888
|
successCount++;
}
catch (Exception ex)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1889
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1890
1891
1892
1893
|
errorCount++;
errorMessages.Add($"处理记录 {(string)item.会员编号}-{(string)item.品项名称} 时出错: {ex.Message}");
}
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1894
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1895
1896
1897
1898
1899
|
// 6. 批量插入开单记录
if (kdjlbEntities.Any())
{
await _db.Insertable(kdjlbEntities).ExecuteCommandAsync();
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1900
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1901
1902
1903
1904
|
// 7. 批量插入品项明细
if (pxmxEntities.Any())
{
await _db.Insertable(pxmxEntities).ExecuteCommandAsync();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1905
|
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1906
1907
1908
|
// 8. 显示进度
if (batchIndex % 10 == 0)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1909
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1910
|
Console.WriteLine($"已处理 {batchIndex + 1}/{totalBatches} 批次,成功 {successCount} 条,失败 {errorCount} 条");
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
|
}
}
_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: 完善开单欠款补缴记录功能
|
1927
|
catch (Exception ex)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1928
1929
1930
1931
1932
1933
|
{
_db.RollbackTran();
throw NCCException.Oh($"导入历史会员权益数据失败: {ex.Message}");
}
}
#endregion
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1934
|
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1935
|
#region 根据门店获取该门店的欠款记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1936
|
/// <summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1937
|
/// 根据门店获取该门店的欠款记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1938
|
/// </summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1939
1940
|
/// <param name="input">查询参数</param>
/// <returns>分页的欠款记录</returns>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1941
|
/// <remarks>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1942
|
/// 获取指定门店的欠款记录,考虑已缴欠款情况,支持分页
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1943
1944
1945
1946
|
///
/// 示例请求:
/// ```json
/// {
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1947
1948
1949
1950
1951
|
/// "storeId": "门店ID",
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "Kdrq",
/// "sort": "desc"
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1952
1953
1954
1955
|
/// }
/// ```
///
/// 参数说明:
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1956
1957
1958
1959
1960
1961
1962
1963
1964
|
/// - storeId: 门店ID,必填
/// - currentPage: 当前页码
/// - pageSize: 每页大小
/// - sidx: 排序字段,默认按开单日期
/// - sort: 排序方式,默认降序
///
/// 返回说明:
/// - 只返回仍有欠款的记录(总欠款 > 已缴欠款)
/// - 包含开单编号、客户信息、欠款金额、已缴金额等
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1965
|
/// </remarks>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1966
1967
1968
1969
1970
|
/// <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”
优化开单记录作废功能:添加详细错误...
|
1971
1972
1973
|
{
try
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1974
|
if (string.IsNullOrEmpty(input.StoreId))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1975
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1976
|
throw NCCException.Oh("门店ID不能为空");
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1977
|
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1978
1979
1980
1981
1982
1983
1984
|
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”
优化开单记录作废功能:添加详细错误...
|
1985
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
|
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: 删除考勤汇总表相关功能...
|
1996
|
paidDebt = it.PaidDebt,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
|
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: 新增门店类别枚举和耗卡...
|
2007
2008
|
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: 删除考勤汇总表相关功能...
|
2009
2010
2011
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2012
2013
2014
2015
2016
2017
|
})
.MergeTable()
.OrderBy(sidx + " " + sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(debtRecords);
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2018
2019
2020
|
}
catch (Exception ex)
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2021
|
throw NCCException.Oh($"获取门店欠款记录失败: {ex.Message}");
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2022
2023
2024
2025
|
}
}
#endregion
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
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
|
#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: 删除考勤汇总表相关功能...
|
2093
2094
2095
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
72cec4b5
“wangming”
feat: 添加转化率统计和升单类型功能
|
2096
|
appointmentId = it.AppointmentId,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
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
|
})
.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
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2151
|
#region 根据会员id获取会员的开单品项列表
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
|
/// <summary>
/// 根据会员id获取会员的开单品项列表
/// </summary>
/// <param name="input">查询参数</param>
/// <returns>会员的开单品项列表</returns>
[HttpPost("GetBillingItemsByMemberId")]
public async Task<dynamic> GetBillingItemsByMemberId([FromBody] BillingItemsByMemberIdQueryInput input)
{
try
{
var query = _db.Queryable<LqKdPxmxEntity>()
.Where(p => p.MemberId == input.MemberId)
.WhereIF(!string.IsNullOrEmpty(input.ItemCategory), p => p.ItemCategory == input.ItemCategory)
.WhereIF(!string.IsNullOrEmpty(input.BillingId), p => p.Glkdbh == input.BillingId)
.WhereIF(input.StartTime.HasValue, p => p.Yjsj >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, p => p.Yjsj <= input.EndTime.Value)
.WhereIF(input.MinActualPrice.HasValue, p => p.ActualPrice >= input.MinActualPrice.Value)
.WhereIF(input.MaxActualPrice.HasValue, p => p.ActualPrice <= input.MaxActualPrice.Value)
.OrderBy(p => p.Yjsj, OrderByType.Desc);
var list = await query.ToPageListAsync(input.currentPage, input.pageSize);
var totalCount = await query.CountAsync();
return new
{
list = list,
pagination = new
{
pageIndex = input.currentPage,
pageSize = input.pageSize,
totalCount = totalCount
}
};
}
catch (Exception ex)
{
throw NCCException.Oh($"获取会员开单品项列表失败: {ex.Message}");
}
}
#endregion
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
|
#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: 完善开单记录汇总查询功能
|
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
|
#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,
|
166f3801
“wangming”
分润统计相关功能及储扣ItemCa...
|
2297
|
Bz = input.Remark,
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2298
2299
2300
2301
2302
2303
2304
2305
|
UpdateTime = DateTime.Now
}).Where(w => w.Id == input.BillingId).ExecuteCommandAsync();
if (updateResult <= 0)
{
throw NCCException.Oh("更新开单记录金额失败");
}
|
4fa0ea16
“wangming”
修复门店领取统计接口SQL语法错误...
|
2306
|
// 更新品项明细金额和备注
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2307
2308
2309
2310
2311
2312
2313
2314
|
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,
|
4fa0ea16
“wangming”
修复门店领取统计接口SQL语法错误...
|
2315
2316
|
ActualPrice = itemDetail.ActualPrice,
Remark = itemDetail.Remark
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2317
2318
|
}).Where(w => w.Id == itemDetail.ItemDetailId && w.Glkdbh == input.BillingId).ExecuteCommandAsync();
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
|
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
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2343
|
#region 获取门店某个时间段的开单记录汇总信息(台账)
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2344
|
/// <summary>
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2345
|
/// 获取门店某个时间段的开单记录汇总信息(台账)
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
|
/// </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 billingQuery = _db.Queryable<LqKdKdjlbEntity>()
.Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode());
// 客户筛选
if (!string.IsNullOrEmpty(input.MemberId))
{
billingQuery = billingQuery.Where(w => w.Kdhy == input.MemberId);
}
// 查询开单记录
var billingRecords = await billingQuery
.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,
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2389
2390
|
hgjg = it.Hgjg,
hgjgName = SqlFunc.Subqueryable<LqHzfEntity>().Where(x => x.Id == it.Hgjg).Select(x => x.Hzmc),
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2391
2392
2393
|
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),
fkfs = it.Fkfs, // 付款方式
|
caf75b4a
“wangming”
feat: 优化开单记录汇总接口,...
|
2394
2395
2396
2397
|
fkyy = it.Fkyy, // 付款医院ID
fkyyName = SqlFunc.Subqueryable<LqHzfEntity>().Where(x => x.Id == it.Fkyy).Select(x => x.Hzmc), // 付款医院名称
activityId = it.ActivityId, // 营销活动ID
activityName = SqlFunc.Subqueryable<LqPackageInfoEntity>().Where(x => x.Id == it.ActivityId).Select(x => x.ActivityName), // 营销活动名称
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2398
2399
2400
|
khly = it.Khly, // 客户来源
bz = it.Bz, // 备注
createTime = it.CreateTime
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2401
|
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
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
|
})
.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();
// 构建品项明细查询条件
var itemDetailsQuery = _db.Queryable<LqKdPxmxEntity>()
.Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode());
// 品项分类筛选
if (!string.IsNullOrEmpty(input.ItemCategory))
{
itemDetailsQuery = itemDetailsQuery.Where(w => w.ItemCategory == input.ItemCategory);
}
// 品项筛选
if (!string.IsNullOrEmpty(input.ItemId))
{
itemDetailsQuery = itemDetailsQuery.Where(w => w.Px == input.ItemId);
}
// 查询品项明细,按F_SourceType分类
var itemDetails = await itemDetailsQuery
.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,
itemCategory = it.ItemCategory,
})
.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 healthTeacherQuery = _db.Queryable<LqKdJksyjEntity>()
.Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode());
// 健康师筛选
if (!string.IsNullOrEmpty(input.HealthCoachId))
{
healthTeacherQuery = healthTeacherQuery.Where(w => w.Jks == input.HealthCoachId || w.Jkszh == input.HealthCoachId);
}
// 品项分类筛选(健康师业绩表)
if (!string.IsNullOrEmpty(input.ItemCategory))
{
healthTeacherQuery = healthTeacherQuery.Where(w => w.ItemCategory == input.ItemCategory);
}
// 品项筛选(健康师业绩表)
if (!string.IsNullOrEmpty(input.ItemId))
{
healthTeacherQuery = healthTeacherQuery.Where(w => w.ItemId == input.ItemId);
}
// 查询健康师业绩数据
var healthTeacherData = await healthTeacherQuery
.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,
itemCategory = it.ItemCategory,
storeId = it.StoreId,
itemId = it.ItemId,
itemName = it.ItemName,
})
.ToListAsync();
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2519
2520
2521
2522
|
// 根据筛选条件过滤开单记录
// 收集所有需要匹配的开单ID(取交集)
var matchedBillingIds = new List<string>();
var hasFilterCondition = false; // 标记是否传入了筛选条件
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2523
|
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2524
2525
|
// 如果传入了品项分类或品项筛选条件,收集匹配的开单ID
if (!string.IsNullOrEmpty(input.ItemCategory) || !string.IsNullOrEmpty(input.ItemId))
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2526
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2527
2528
2529
|
hasFilterCondition = true;
var itemMatchedIds = itemDetails.Select(x => x.glkdbh).Distinct().ToList();
if (matchedBillingIds.Any())
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
2530
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2531
2532
2533
2534
2535
2536
|
matchedBillingIds = matchedBillingIds.Intersect(itemMatchedIds).ToList();
}
else
{
matchedBillingIds = itemMatchedIds;
}
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2537
2538
|
}
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2539
2540
|
// 如果传入了健康师筛选条件,收集匹配的开单ID
if (!string.IsNullOrEmpty(input.HealthCoachId))
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2541
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2542
2543
2544
|
hasFilterCondition = true;
var healthTeacherMatchedIds = healthTeacherData.Select(x => x.glkdbh).Distinct().ToList();
if (matchedBillingIds.Any())
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2545
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2546
2547
2548
|
matchedBillingIds = matchedBillingIds.Intersect(healthTeacherMatchedIds).ToList();
}
else
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2549
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2550
2551
|
matchedBillingIds = healthTeacherMatchedIds;
}
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2552
2553
|
}
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2554
2555
2556
2557
|
// 如果传入了筛选条件,必须过滤开单记录(即使没有匹配数据也要过滤,返回空结果)
if (hasFilterCondition)
{
if (matchedBillingIds.Any())
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2558
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2559
2560
2561
|
billingRecords = billingRecords.Where(x => matchedBillingIds.Contains(x.id)).ToList();
}
else
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2562
|
{
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2563
2564
2565
2566
2567
|
// 传入了筛选条件但没有匹配数据,返回空结果
billingRecords = billingRecords.Where(x => false).ToList();
}
billingIds = billingRecords.Select(x => x.id).ToList();
}
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
|
// 构建按开单记录分组的详细数据
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,
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
2579
2580
|
cooperationInstitution = billing.hgjg,
cooperationInstitutionName = billing.hgjgName,
|
caf75b4a
“wangming”
feat: 优化开单记录汇总接口,...
|
2581
2582
2583
2584
|
paymentHospital = billing.fkyy, // 付款医院ID
paymentHospitalName = billing.fkyyName, // 付款医院名称
activityId = billing.activityId, // 营销活动ID
activityName = billing.activityName, // 营销活动名称
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
|
// 品项分类
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,
|
9ec80591
“wangming”
优化库存使用批量创建接口:库存不足...
|
2595
2596
|
remark = x.remark,
itemCategory = x.itemCategory,
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
|
}).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,
|
9ec80591
“wangming”
优化库存使用批量创建接口:库存不足...
|
2608
2609
|
remark = x.remark,
itemCategory = x.itemCategory,
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
|
}).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,
|
9ec80591
“wangming”
优化库存使用批量创建接口:库存不足...
|
2621
2622
|
remark = x.remark,
itemCategory = x.itemCategory,
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
|
}).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,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
2639
2640
2641
2642
2643
|
goldTriangleId = x.jsj_id,
itemCategory = x.itemCategory,
itemId = x.itemId,
storeId = x.storeId,
itemName = x.itemName
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
|
}).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 = "获取开单记录汇总信息成功"
};
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2676
2677
2678
2679
2680
2681
2682
2683
2684
|
return result;
}
catch (Exception ex)
{
throw NCCException.Oh($"获取开单记录汇总信息失败:{ex.Message}");
}
}
#endregion
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
|
#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相关...
|
2706
|
// 判断是否有对应的补缴记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2707
|
var qkbjList = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.SupplementBillingId == billingId && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2708
2709
2710
2711
|
if (qkbjList.Any())
{
return (false, "该开单记录有对应的补缴记录,不能进行操作");
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2712
|
// 查询开单记录下的品项明细ID列表
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2713
|
var pxmxIdList = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Glkdbh == billingId && p.IsEffective == StatusEnum.有效.GetHashCode()).Select(p => p.Id).Distinct().ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2714
|
// 判断是否有对应的消耗记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2715
|
var xhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2716
2717
2718
2719
2720
|
if (xhPxmxList.Any())
{
return (false, "该开单记录有对应的消耗记录,不能进行操作");
}
// 判断是否有退卡记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2721
|
var hytkMxList = await _db.Queryable<LqHytkMxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2722
2723
2724
2725
2726
|
if (hytkMxList.Any())
{
return (false, "该开单记录有对应的退卡记录,不能进行操作");
}
// 判断是否已经有储扣记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2727
|
var deductInfoList = await _db.Queryable<LqKdDeductinfoEntity>().Where(p => pxmxIdList.Contains(p.DeductId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
|
if (deductInfoList.Any())
{
return (false, "该开单记录有对应的储扣记录,不能进行操作");
}
return (true, string.Empty);
}
catch (Exception ex)
{
return (false, $"检查开单记录状态失败: {ex.Message}");
}
}
#endregion
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
2741
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2742
2743
2744
2745
2746
2747
2748
2749
|
#region 会员转卡操作
/// <summary>
/// 会员转卡操作
/// </summary>
/// <remarks>
/// 转卡是指一个会员把自己剩余的某些品项,转给另外一个会员
/// 转卡会员转出的品项,就做退卡操作
/// 被转卡会员收到的品项,做开卡操作
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2750
|
/// 系统会自动从原开单记录中获取健康师和科技部老师的业绩数据
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2751
2752
2753
2754
2755
2756
2757
|
///
/// 示例请求:
/// ```json
/// {
/// "fromMemberId": "member001",
/// "toMemberId": "member002",
/// "storeId": "store001",
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2758
2759
|
/// "signatureFile": "base64签名数据",
/// "remarks": "转卡备注信息",
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2760
2761
|
/// "transferItems": [
/// {
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2762
|
/// "billingItemId": "pxmx001",
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2763
|
/// "transferQuantity": 5,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2764
2765
|
/// "itemName": "美容项目A",
/// "itemPrice": 100.00
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2766
2767
2768
2769
2770
2771
|
/// }
/// ]
/// }
/// ```
///
/// 参数说明:
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
|
/// - fromMemberId: 转出会员ID(必填)
/// - toMemberId: 转入会员ID(必填)
/// - storeId: 门店ID(必填)
/// - signatureFile: 转出会员签名文件(必填)
/// - remarks: 转卡备注信息(可选)
/// - transferItems: 转出品项列表(必填)
/// - billingItemId: 开单品项明细ID(必填)
/// - transferQuantity: 转出数量(必填,大于0)
/// - itemName: 品项名称(必填)
/// - itemPrice: 品项价格(必填,大于等于0)
///
/// 业务规则:
/// - 转出和转入会员必须存在且有效
/// - 转出品项的剩余数量必须足够
/// - 系统会自动从原开单记录中获取健康师和科技部老师业绩数据
/// - 转卡操作会同时创建退卡记录和开卡记录
/// - 所有操作在事务中执行,确保数据一致性
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
|
/// </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: 实现转卡接口和库存管理功能
|
2802
2803
|
var userInfo = await _userManager.GetUserInfo();
var transferTime = DateTime.Now;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2804
2805
2806
2807
|
try
{
// 开启事务
_db.BeginTran();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
|
// 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: 实现转卡接口和库存管理功能
|
2819
2820
2821
2822
2823
2824
2825
2826
|
// 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: 实现转卡接口和库存管理功能
|
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
|
// 查询剩余数量
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
|
2837
|
var totalRefundAmount = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity);
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2838
|
var StoreEntity = await _db.Queryable<LqMdxxEntity>().Where(p => p.Id == input.StoreId).FirstAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
|
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...
|
2849
2850
|
Mdmc = StoreEntity.Dm,
Mdbh = StoreEntity.Mdbm,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2851
|
SignatureFile = input.SignatureFile,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2852
2853
2854
|
Hyzh = input.FromMemberId,
Gklx = fromMember.Khlx,
Tksj = DateTime.Now,
|
63df7ccb
“wangming”
1
|
2855
2856
|
Tkje = totalRefundAmount,
ActualRefundAmount = totalRefundAmount, // 转卡时实退金额等于退卡总金额
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2857
2858
2859
2860
2861
2862
2863
2864
|
Tkyy = "转卡",
Bz = $"转卡给会员:{toMember.Khmc},{input.Remarks}"
};
await _db.Insertable(refundEntity).ExecuteCommandAsync();
// 4. 创建退卡品项明细和业绩记录
var refundMxEntities = new List<LqHytkMxEntity>();
var refundJksyjEntities = new List<LqHytkJksyjEntity>();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2865
2866
2867
2868
|
var refundKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
foreach (var item in input.TransferItems)
{
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2869
|
var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
|
63df7ccb
“wangming”
1
|
2870
|
//计算品项扣除总金额
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2871
|
var totalItemDeduction = item.ItemPrice * item.TransferQuantity;
|
63df7ccb
“wangming”
1
|
2872
|
//保存退卡明细表
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2873
2874
2875
2876
2877
|
var refundMxEntity = new LqHytkMxEntity
{
Id = YitIdHelper.NextId().ToString(),
RefundInfoId = refundId,
BillingItemId = item.BillingItemId,
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
2878
|
MemberId = input.FromMemberId, // 转卡时使用转出方会员ID
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2879
2880
|
CreateTime = transferTime,
CreateUser = userInfo.userId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2881
|
Px = refundPxmxEntity.Px,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2882
2883
|
Pxmc = item.ItemName,
Pxjg = item.ItemPrice,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2884
|
Tkje = totalItemDeduction,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2885
|
ProjectNumber = item.TransferQuantity,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2886
2887
|
SourceType = refundPxmxEntity.SourceType,
TotalPrice = totalItemDeduction,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
2888
2889
|
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Qt2).FirstAsync(),
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
2890
|
PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Fl3).FirstAsync() ?? "",
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
2891
|
BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.BeautyType).FirstAsync(),
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2892
2893
|
};
refundMxEntities.Add(refundMxEntity);
|
63df7ccb
“wangming”
1
|
2894
2895
2896
|
var refundKdyjEntities = _db.Queryable<LqKdJksyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
//保存退卡健康师业绩表
foreach (var jks in refundKdyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2897
|
{
|
63df7ccb
“wangming”
1
|
2898
2899
|
//获取健康师当月金三角id
var monthString = DateTime.Now.ToString("yyyyMM");
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2900
2901
2902
2903
2904
2905
|
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
|
2906
2907
|
//获取本月
refundJksyjEntities.Add(new LqHytkJksyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2908
|
{
|
63df7ccb
“wangming”
1
|
2909
2910
|
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
|
5dc762df
“wangming”
Enhance performan...
|
2911
|
Jks = jks.Jkszh,
|
63df7ccb
“wangming”
1
|
2912
2913
|
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
2914
|
Jksyj = totalItemDeduction / refundKdyjEntities.Count(),
|
63df7ccb
“wangming”
1
|
2915
2916
2917
2918
2919
2920
2921
|
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,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
2922
2923
2924
2925
|
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = refundMxEntity.ItemCategory,
ItemId = refundMxEntity.Px,
StoreId = refundEntity.Md,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
2926
|
ItemName = refundMxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
2927
2928
|
PerformanceType = refundMxEntity.PerformanceType,
BeautyType = refundMxEntity.BeautyType,
|
63df7ccb
“wangming”
1
|
2929
|
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2930
|
}
|
63df7ccb
“wangming”
1
|
2931
2932
|
//查询科技部老师的业绩
var TechTeacherEntities = _db.Queryable<LqKdKjbsyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2933
|
// 创建退卡科技部老师业绩记录
|
63df7ccb
“wangming”
1
|
2934
|
foreach (var kjbs in TechTeacherEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2935
|
{
|
63df7ccb
“wangming”
1
|
2936
|
refundKjbsyjEntities.Add(new LqHytkKjbsyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2937
|
{
|
63df7ccb
“wangming”
1
|
2938
2939
2940
2941
2942
|
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2943
|
Kjblsyj = (totalItemDeduction / TechTeacherEntities.Count()),
|
63df7ccb
“wangming”
1
|
2944
2945
2946
2947
2948
2949
2950
|
Tksj = transferTime,
F_tkpxid = refundMxEntity.Id,
F_LaborCost = kjbs.LaborCost,
F_tkpxNumber = item.TransferQuantity,
F_CreateTime = transferTime,
F_CreateUser = userInfo.userId,
CardReturn = refundMxEntity.Id,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
2951
2952
2953
2954
|
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = refundMxEntity.ItemCategory,
ItemId = refundMxEntity.Px,
StoreId = refundEntity.Md,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
2955
|
ItemName = refundMxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
2956
2957
|
PerformanceType = refundMxEntity.PerformanceType,
BeautyType = refundMxEntity.BeautyType,
|
63df7ccb
“wangming”
1
|
2958
|
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
|
}
}
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...
|
2983
2984
|
Kdrq = DateTime.Now,
Gjlx = toMember.Khlx,
|
63df7ccb
“wangming”
1
|
2985
2986
|
Fkfs = "转卡",
Sfskdd = "否",
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2987
|
Zdyj = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
|
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...
|
2999
|
var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
|
// 计算转卡金额和数量
var transferAmount = item.ItemPrice * item.TransferQuantity;
var transferQuantity = item.TransferQuantity;
// 获取原开单品项的总金额和总数量
var originalTotalPrice = refundPxmxEntity.TotalPrice > 0 ? refundPxmxEntity.TotalPrice : refundPxmxEntity.ActualPrice;
var originalProjectNumber = refundPxmxEntity.ProjectNumber > 0 ? refundPxmxEntity.ProjectNumber : 1;
// 计算转卡比例(优先使用金额比例,如果金额为0则使用数量比例)
decimal transferRatio = 0;
if (originalTotalPrice > 0)
{
transferRatio = transferAmount / originalTotalPrice;
}
else if (originalProjectNumber > 0)
{
transferRatio = (decimal)transferQuantity / originalProjectNumber;
}
else
{
transferRatio = 1; // 如果原数据异常,默认按100%计算
}
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3023
3024
3025
3026
|
var billingPxmxEntity = new LqKdPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3027
|
Px = refundPxmxEntity.Px,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3028
3029
3030
3031
3032
3033
|
Pxmc = item.ItemName,
Pxjg = item.ItemPrice,
MemberId = input.ToMemberId,
CreateTIme = transferTime,
ProjectNumber = item.TransferQuantity,
IsEnabled = StatusEnum.有效.GetHashCode(),
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3034
|
SourceType = refundPxmxEntity.SourceType,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3035
3036
|
TotalPrice = transferAmount,
ActualPrice = transferAmount,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3037
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
3038
3039
|
Remark = $"从会员 {fromMember.Khmc} 转入",
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Qt2).FirstAsync(),
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3040
|
PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Fl3).FirstAsync() ?? "",
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
3041
|
BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.BeautyType).FirstAsync(),
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3042
3043
3044
|
};
billingPxmxEntities.Add(billingPxmxEntity);
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3045
3046
3047
|
// 查询原开单记录的健康师业绩
var billingKdyjEntitiesList = _db.Queryable<LqKdJksyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
if (billingKdyjEntitiesList.Any())
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3048
|
{
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3049
3050
3051
3052
|
// 计算原开单所有健康师的总业绩
var originalTotalJksyj = billingKdyjEntitiesList.Sum(x => decimal.Parse(x.Jksyj ?? "0"));
// 如果原开单总业绩为0,则按转卡金额均分
if (originalTotalJksyj == 0)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3053
|
{
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
|
var avgJksyj = transferAmount / billingKdyjEntitiesList.Count;
foreach (var jks in billingKdyjEntitiesList)
{
billingJksyjEntities.Add(new LqKdJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
Jks = jks.Jkszh,
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
Jksyj = avgJksyj.ToString("F2"),
Yjsj = transferTime,
Jsj_id = jks.Jsj_id,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = billingPxmxEntity.ItemCategory,
ItemId = billingPxmxEntity.Px,
StoreId = billingEntity.Djmd,
ItemName = billingPxmxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
3073
3074
|
PerformanceType = billingPxmxEntity.PerformanceType,
BeautyType = billingPxmxEntity.BeautyType,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
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
|
});
}
}
else
{
// 按原业绩比例计算转卡后的业绩
foreach (var jks in billingKdyjEntitiesList)
{
var originalJksyj = decimal.Parse(jks.Jksyj ?? "0");
// 计算该健康师在原开单中的业绩占比
var jksRatio = originalTotalJksyj > 0 ? originalJksyj / originalTotalJksyj : 0;
// 转卡后的业绩 = 转卡金额 × 该健康师的业绩占比
var transferJksyj = transferAmount * jksRatio;
billingJksyjEntities.Add(new LqKdJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
Jks = jks.Jkszh,
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
Jksyj = transferJksyj.ToString("F2"),
Yjsj = transferTime,
Jsj_id = jks.Jsj_id,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = billingPxmxEntity.ItemCategory,
ItemId = billingPxmxEntity.Px,
StoreId = billingEntity.Djmd,
ItemName = billingPxmxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
3105
3106
|
PerformanceType = billingPxmxEntity.PerformanceType,
BeautyType = billingPxmxEntity.BeautyType,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3107
3108
3109
|
});
}
}
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3110
3111
|
}
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3112
3113
3114
|
// 查询原开单记录的科技部老师业绩
var billingKjbsyjEntitiesList = _db.Queryable<LqKdKjbsyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
if (billingKjbsyjEntitiesList.Any())
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3115
|
{
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3116
3117
3118
3119
3120
|
// 计算原开单所有科技部老师的总业绩
var originalTotalKjbsyj = billingKjbsyjEntitiesList.Sum(x => decimal.Parse(x.Kjblsyj ?? "0"));
// 如果原开单总业绩为0,则按转卡金额均分
if (originalTotalKjbsyj == 0)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3121
|
{
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
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
|
var avgKjbsyj = transferAmount / billingKjbsyjEntitiesList.Count;
foreach (var kjbs in billingKjbsyjEntitiesList)
{
billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
Kjblsyj = avgKjbsyj.ToString("F2"),
Yjsj = transferTime,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = billingPxmxEntity.ItemCategory,
ItemId = billingPxmxEntity.Px,
StoreId = billingEntity.Djmd,
ItemName = billingPxmxEntity.Pxmc,
PerformanceType = billingPxmxEntity.PerformanceType
});
}
}
else
{
// 按原业绩比例计算转卡后的业绩
foreach (var kjbs in billingKjbsyjEntitiesList)
{
var originalKjbsyj = decimal.Parse(kjbs.Kjblsyj ?? "0");
// 计算该科技部老师在原开单中的业绩占比
var kjbsRatio = originalTotalKjbsyj > 0 ? originalKjbsyj / originalTotalKjbsyj : 0;
// 转卡后的业绩 = 转卡金额 × 该科技部老师的业绩占比
var transferKjbsyj = transferAmount * kjbsRatio;
billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
Kjblsyj = transferKjbsyj.ToString("F2"),
Yjsj = transferTime,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ItemCategory = billingPxmxEntity.ItemCategory,
ItemId = billingPxmxEntity.Px,
StoreId = billingEntity.Djmd,
ItemName = billingPxmxEntity.Pxmc,
PerformanceType = billingPxmxEntity.PerformanceType
});
}
}
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3174
3175
|
}
}
|
5b462535
“wangming”
1111
|
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
|
//记录转卡日志
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()
|
5b462535
“wangming”
1111
|
3190
3191
|
};
await _db.Insertable(transferLogEntity).ExecuteCommandAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
|
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: 实现转卡接口和库存管理功能
|
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
|
#region 获取品项剩余数量
/// <summary>
/// 获取品项剩余数量
/// </summary>
/// <param name="billingItemId">开单品项明细ID</param>
/// <returns>剩余数量</returns>
private async Task<int> GetItemRemainingCount(string billingItemId)
{
try
{
// 查询购买数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3239
3240
|
var purchasedCount = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => x.Id == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3241
|
.SumAsync(x => (decimal?)x.ProjectNumber) ?? 0m;
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3242
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3243
|
// 查询消费数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3244
3245
|
var consumedCount = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => x.BillingItemId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3246
|
.SumAsync(x => x.OriginalProjectNumber) ?? 0m;
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3247
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3248
|
// 查询退卡数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3249
3250
|
var refundedCount = await _db.Queryable<LqHytkMxEntity>()
.Where(x => x.BillingItemId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3251
|
.SumAsync(x => (decimal?)x.ProjectNumber) ?? 0m;
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3252
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3253
|
// 查询储扣数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3254
3255
|
var deductCount = await _db.Queryable<LqKdDeductinfoEntity>()
.Where(x => x.DeductId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3256
|
.SumAsync(x => (decimal?)x.ProjectNumber) ?? 0m;
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
3257
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
|
// 计算剩余数量
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
|
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
|
#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: 消耗项目数(项目总次数)
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
3312
|
/// - RefundAmount: 退卡金额(健康师退卡业绩总金额)
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
3313
3314
3315
|
/// - LaborCost: 手工费(消耗时的手工费总金额)
/// - OriginalLaborCost: 原始手工费(消耗时的原始手工费总金额)
/// - OvertimeLaborCost: 加班手工费(消耗时的加班手工费总金额)
|
68b8deb5
“wangming”
123213
|
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
3348
3349
3350
3351
3352
3353
3354
3355
|
/// </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,
|
9ec80591
“wangming”
优化库存使用批量创建接口:库存不足...
|
3356
3357
3358
3359
|
CAST(COALESCE(headcount_stats.HeadCount, 0) AS DECIMAL(18,2)) as HeadCount,
CAST(COALESCE(personcount_stats.PersonCount, 0) AS DECIMAL(18,2)) as PersonCount,
CAST(COALESCE(invalid_headcount_stats.HeadCount, 0) AS DECIMAL(18,2)) as InvalidHeadCount,
CAST(COALESCE(invalid_personcount_stats.PersonCount, 0) AS DECIMAL(18,2)) as InvalidPersonCount,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
3360
3361
3362
|
CAST(COALESCE(consume_stats.ProjectCount, 0) AS DECIMAL(18,2)) as ProjectCount,
-- 退卡金额
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
|
COALESCE(refund_stats.RefundAmount, 0) as RefundAmount,
-- 手工费相关统计
COALESCE(consume_stats.LaborCost, 0) as LaborCost,
COALESCE(consume_stats.OriginalLaborCost, 0) as OriginalLaborCost,
COALESCE(consume_stats.OvertimeLaborCost, 0) as OvertimeLaborCost
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.jks as EmployeeId,
SUM(jksyj.jksyj) as ConsumeAmount,
CAST(SUM(jksyj.F_kdpxNumber) AS DECIMAL(18,2)) as ProjectCount,
COALESCE(SUM(jksyj.F_LaborCost), 0) as LaborCost,
COALESCE(SUM(jksyj.F_OriginalLaborCost), 0) as OriginalLaborCost,
COALESCE(SUM(jksyj.F_OvertimeLaborCost), 0) as OvertimeLaborCost
FROM lq_xh_jksyj jksyj
INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
WHERE jksyj.jks IS NOT NULL
AND jksyj.F_IsEffective = 1
AND hyhk.F_IsEffective = 1
AND hyhk.hksj >= @startTime
AND hyhk.hksj <= @endTime
GROUP BY jksyj.jks
) consume_stats ON u.F_Id = consume_stats.EmployeeId
-- 有效人头统计子查询(从人次记录表获取,按月份+客户+数量去重后累加数量,F_HasBilling=1)
LEFT JOIN (
SELECT
F_PersonId as EmployeeId,
CAST(COALESCE(SUM(F_Quantity), 0) AS DECIMAL(18,2)) as HeadCount
FROM (
SELECT
F_PersonId,
F_WorkMonth,
F_MemberId,
F_Quantity
FROM lq_person_times_record
WHERE F_PersonId IS NOT NULL
AND F_IsEffective = 1
AND F_PersonType = '健康师'
AND F_HasBilling = 1
AND F_WorkDate >= DATE(@startTime)
AND F_WorkDate <= DATE(@endTime)
GROUP BY F_PersonId, F_WorkMonth, F_MemberId, F_Quantity
) as distinct_headcount
GROUP BY F_PersonId
) headcount_stats ON u.F_Id = headcount_stats.EmployeeId
-- 有效人次统计子查询(从人次记录表获取,按日期+客户+数量去重后累加数量,F_HasBilling=1)
LEFT JOIN (
SELECT
F_PersonId as EmployeeId,
CAST(COALESCE(SUM(F_Quantity), 0) AS DECIMAL(18,2)) as PersonCount
FROM (
SELECT
F_PersonId,
F_WorkDate,
F_MemberId,
F_Quantity
FROM lq_person_times_record
WHERE F_PersonId IS NOT NULL
AND F_IsEffective = 1
AND F_PersonType = '健康师'
AND F_HasBilling = 1
AND F_WorkDate >= DATE(@startTime)
AND F_WorkDate <= DATE(@endTime)
GROUP BY F_PersonId, F_WorkDate, F_MemberId, F_Quantity
) as distinct_personcount
GROUP BY F_PersonId
) personcount_stats ON u.F_Id = personcount_stats.EmployeeId
-- 无效人头统计子查询(从人次记录表获取,按月份+客户+数量去重后累加数量,F_HasBilling=0)
LEFT JOIN (
SELECT
F_PersonId as EmployeeId,
CAST(COALESCE(SUM(F_Quantity), 0) AS DECIMAL(18,2)) as HeadCount
FROM (
SELECT
F_PersonId,
F_WorkMonth,
F_MemberId,
F_Quantity
FROM lq_person_times_record
WHERE F_PersonId IS NOT NULL
AND F_IsEffective = 1
AND F_PersonType = '健康师'
AND F_HasBilling = 0
AND F_WorkDate >= DATE(@startTime)
AND F_WorkDate <= DATE(@endTime)
GROUP BY F_PersonId, F_WorkMonth, F_MemberId, F_Quantity
) as distinct_headcount
GROUP BY F_PersonId
) invalid_headcount_stats ON u.F_Id = invalid_headcount_stats.EmployeeId
-- 无效人次统计子查询(从人次记录表获取,按日期+客户+数量去重后累加数量,F_HasBilling=0)
LEFT JOIN (
SELECT
F_PersonId as EmployeeId,
CAST(COALESCE(SUM(F_Quantity), 0) AS DECIMAL(18,2)) as PersonCount
FROM (
SELECT
F_PersonId,
F_WorkDate,
F_MemberId,
F_Quantity
FROM lq_person_times_record
WHERE F_PersonId IS NOT NULL
AND F_IsEffective = 1
AND F_PersonType = '健康师'
AND F_HasBilling = 0
AND F_WorkDate >= DATE(@startTime)
AND F_WorkDate <= DATE(@endTime)
GROUP BY F_PersonId, F_WorkDate, F_MemberId, F_Quantity
) as distinct_personcount
GROUP BY F_PersonId
) invalid_personcount_stats ON u.F_Id = invalid_personcount_stats.EmployeeId
-- 退卡统计子查询
LEFT JOIN (
SELECT
jkszh as EmployeeId,
SUM(CAST(jksyj AS DECIMAL(18,2))) as RefundAmount
FROM lq_hytk_jksyj
WHERE jkszh IS NOT NULL
AND F_IsEffective = 1
AND tksj >= @startTime
AND tksj <= @endTime
GROUP BY jkszh
) refund_stats ON u.F_Id = refund_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: 新增开单品项明细记录列...
|
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
|
#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: 开单品项明细记录列表接...
|
3640
3641
|
/// "SourceType": "来源类型",
/// "StoreId": "门店ID"
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
|
/// }
/// ```
///
/// 查询参数说明:
/// - 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: 开单品项明细记录列表接...
|
3662
|
/// - StoreId: 门店ID(可选,精确匹配,根据开单记录表的门店ID筛选)
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
|
///
/// 返回数据结构:
/// ```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: 开单品项明细记录列表接...
|
3685
3686
3687
|
/// "remark": "备注",
/// "storeId": "门店ID",
/// "storeName": "门店名称"
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
|
/// }
/// ]
/// }
/// ```
///
/// 返回字段说明:
/// - id: 品项明细ID(主键)
/// - billingId: 开单ID(关联开单记录表)
/// - billingTime: 开单时间(业绩时间yjsj,DateTime格式)
/// - activityName: 营销活动名称(关联营销活动表)
/// - memberName: 会员名称(关联会员表)
/// - memberPhone: 会员手机号(关联会员表)
/// - itemName: 品项名称(品项明细表字段)
/// - itemType: 品项类型(关联项目资料表的qt2字段)
/// - actualPrice: 实付金额(decimal类型)
/// - projectNumber: 项目次数(decimal类型,支持小数)
/// - sourceType: 来源类型(字符串,如:购买、赠送、体验)
/// - remark: 备注(字符串)
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3706
3707
|
/// - storeId: 门店ID(关联开单记录表的门店ID)
/// - storeName: 门店名称(关联门店表的店名字段)
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
|
/// </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;
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3722
|
// 处理开单时间范围(兼容 StartBillingTime/EndBillingTime 和 startTime/endTime 两种参数名)
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3723
3724
|
DateTime? startBillingTime = null;
DateTime? endBillingTime = null;
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3725
3726
3727
3728
3729
3730
|
// 优先使用 StartBillingTime/EndBillingTime,如果没有则使用 startTime/endTime
string startTimeStr = !string.IsNullOrEmpty(input.StartBillingTime) ? input.StartBillingTime : input.startTime;
string endTimeStr = !string.IsNullOrEmpty(input.EndBillingTime) ? input.EndBillingTime : input.endTime;
if (!string.IsNullOrEmpty(startTimeStr) && !string.IsNullOrEmpty(endTimeStr))
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3731
|
{
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
|
// 尝试解析日期字符串(支持多种格式)
if (DateTime.TryParse(startTimeStr, out DateTime startDate))
{
startBillingTime = startDate;
}
else
{
throw NCCException.Oh($"开始时间格式错误:{startTimeStr}");
}
if (DateTime.TryParse(endTimeStr, out DateTime endDate))
{
endBillingTime = endDate;
}
else
{
throw NCCException.Oh($"结束时间格式错误:{endTimeStr}");
}
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3750
3751
3752
3753
3754
3755
3756
3757
|
}
// 优化查询:先分页查询主表,再批量查询关联数据,避免子查询性能问题
// 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)
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3758
3759
|
.WhereIF(startBillingTime.HasValue, pxmx => pxmx.Yjsj >= new DateTime(startBillingTime.Value.Year, startBillingTime.Value.Month, startBillingTime.Value.Day, 0, 0, 0))
.WhereIF(endBillingTime.HasValue, pxmx => pxmx.Yjsj <= new DateTime(endBillingTime.Value.Year, endBillingTime.Value.Month, endBillingTime.Value.Day, 23, 59, 59))
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3760
3761
3762
3763
|
.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))
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3764
3765
|
.WhereIF(!string.IsNullOrEmpty(input.SourceType), pxmx => pxmx.SourceType == input.SourceType)
.WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => pxmx.ItemCategory == input.ItemType);
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3766
3767
|
// 2. 通过 EXISTS 子查询筛选关联字段(在分页前筛选,确保分页准确)
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3768
3769
|
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: 开单品项明细记录列表接...
|
3770
|
.WhereIF(!string.IsNullOrEmpty(input.StoreId), pxmx => SqlFunc.Subqueryable<LqKdKdjlbEntity>().Where(x => x.Id == pxmx.Glkdbh && x.Djmd == input.StoreId).Any());
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3771
3772
|
// 3. 先分页查询主表数据(查询实体类,提高性能)
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3773
|
var pagedData = await baseQuery.OrderBy(sidx + " " + sort).ToPagedListAsync(input.currentPage, input.pageSize);
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3774
3775
3776
3777
3778
|
// 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();
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3779
|
var billingIds = pagedData.list.Where(x => !string.IsNullOrEmpty(x.Glkdbh)).Select(x => x.Glkdbh).Distinct().ToList();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3780
3781
3782
3783
3784
|
// 批量查询会员信息
var memberDict = new Dictionary<string, (string Name, string Phone)>();
if (memberIds.Any())
{
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3785
|
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: 新增开单品项明细记录列...
|
3786
3787
3788
3789
3790
3791
3792
|
memberDict = members.ToDictionary(x => x.Id, x => (x.Khmc ?? "", x.Sjh ?? ""));
}
// 批量查询活动信息
var activityDict = new Dictionary<string, string>();
if (activityIds.Any())
{
|
0fae5e6f
“wangming”
refactor: 优化查询逻辑和...
|
3793
|
var activities = await _db.Queryable<LqPackageInfoEntity>().Where(x => activityIds.Contains(x.Id)).Select(x => new { x.Id, x.ActivityName }).ToListAsync();
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3794
3795
3796
|
activityDict = activities.ToDictionary(x => x.Id, x => x.ActivityName ?? "");
}
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3797
|
// 批量查询开单记录,获取门店ID
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3798
|
// 批量查询开单记录,获取门店ID及扩展信息
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3799
|
var billingStoreDict = new Dictionary<string, string>();
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3800
3801
|
var billingExtraInfoDict = new Dictionary<string, dynamic>();
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3802
3803
|
if (billingIds.Any())
{
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3804
3805
|
var billings = await _db.Queryable<LqKdKdjlbEntity>()
.Where(x => billingIds.Contains(x.Id))
|
6af31905
“wangming”
feat: 优化多个接口功能
|
3806
|
.Select(x => new { x.Id, x.Djmd, x.Hgjg, x.Fkyy, x.Fkfs })
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3807
3808
|
.ToListAsync();
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3809
|
billingStoreDict = billings.ToDictionary(x => x.Id, x => x.Djmd ?? "");
|
6af31905
“wangming”
feat: 优化多个接口功能
|
3810
|
billingExtraInfoDict = billings.ToDictionary(x => x.Id, x => (dynamic)new { Hgjg = x.Hgjg, Fkyy = x.Fkyy, Fkfs = x.Fkfs });
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
|
}
// 批量查询门店信息
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 ?? "");
}
|
4fa0ea16
“wangming”
修复门店领取统计接口SQL语法错误...
|
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
|
// 批量查询合作机构和医院名称
var hgjgIds = billingExtraInfoDict.Values.Where(x => !string.IsNullOrEmpty(x.Hgjg)).Select(x => x.Hgjg).Distinct().ToList();
var fkyyIds = billingExtraInfoDict.Values.Where(x => !string.IsNullOrEmpty(x.Fkyy)).Select(x => x.Fkyy).Distinct().ToList();
var hzfIds = hgjgIds.Union(fkyyIds).Distinct().ToList();
var hzfDict = new Dictionary<string, string>();
if (hzfIds.Any())
{
var hzfList = await _db.Queryable<LqHzfEntity>()
.Where(x => hzfIds.Contains(x.Id))
.Select(x => new { x.Id, x.Hzmc })
.ToListAsync();
hzfDict = hzfList.ToDictionary(x => x.Id, x => x.Hzmc ?? "");
}
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
|
// 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,
|
b5ed92da
“wangming”
feat: 修复转卡接口和开单品项...
|
3846
|
itemType = pxmx.ItemCategory,
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3847
3848
3849
|
actualPrice = pxmx.ActualPrice,
projectNumber = pxmx.ProjectNumber,
sourceType = pxmx.SourceType,
|
631fcb03
“wangming”
feat: 开单品项明细记录列表接...
|
3850
3851
|
remark = pxmx.Remark,
storeId = pxmx.Glkdbh != null && billingStoreDict.ContainsKey(pxmx.Glkdbh) ? billingStoreDict[pxmx.Glkdbh] : "",
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3852
3853
|
storeName = pxmx.Glkdbh != null && billingStoreDict.ContainsKey(pxmx.Glkdbh) && !string.IsNullOrEmpty(billingStoreDict[pxmx.Glkdbh]) && storeDict.ContainsKey(billingStoreDict[pxmx.Glkdbh]) ? storeDict[billingStoreDict[pxmx.Glkdbh]] : "",
hgjg = pxmx.Glkdbh != null && billingExtraInfoDict.ContainsKey(pxmx.Glkdbh) ? billingExtraInfoDict[pxmx.Glkdbh].Hgjg : "",
|
4fa0ea16
“wangming”
修复门店领取统计接口SQL语法错误...
|
3854
|
hgjgName = pxmx.Glkdbh != null && billingExtraInfoDict.ContainsKey(pxmx.Glkdbh) && !string.IsNullOrEmpty(billingExtraInfoDict[pxmx.Glkdbh].Hgjg) && hzfDict.ContainsKey(billingExtraInfoDict[pxmx.Glkdbh].Hgjg) ? hzfDict[billingExtraInfoDict[pxmx.Glkdbh].Hgjg] : "",
|
6af31905
“wangming”
feat: 优化多个接口功能
|
3855
|
fkyy = pxmx.Glkdbh != null && billingExtraInfoDict.ContainsKey(pxmx.Glkdbh) ? billingExtraInfoDict[pxmx.Glkdbh].Fkyy : "",
|
4fa0ea16
“wangming”
修复门店领取统计接口SQL语法错误...
|
3856
|
fkyyName = pxmx.Glkdbh != null && billingExtraInfoDict.ContainsKey(pxmx.Glkdbh) && !string.IsNullOrEmpty(billingExtraInfoDict[pxmx.Glkdbh].Fkyy) && hzfDict.ContainsKey(billingExtraInfoDict[pxmx.Glkdbh].Fkyy) ? hzfDict[billingExtraInfoDict[pxmx.Glkdbh].Fkyy] : "",
|
6af31905
“wangming”
feat: 优化多个接口功能
|
3857
|
paymentMethod = pxmx.Glkdbh != null && billingExtraInfoDict.ContainsKey(pxmx.Glkdbh) ? billingExtraInfoDict[pxmx.Glkdbh].Fkfs : ""
|
e97f24a6
“wangming”
feat: 新增开单品项明细记录列...
|
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
|
}).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
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
|
#region 返回储扣列表
/// <summary>
/// 获取储扣列表
/// </summary>
/// <remarks>
/// 获取开单扣减信息(储扣)列表,支持多种条件筛选和分页查询
///
/// 示例请求:
/// ```json
/// {
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "CreateTime",
/// "sort": "desc",
/// "DeductType": "储值",
/// "BillingId": "开单ID",
/// "ItemName": "品项名称",
/// "MinAmount": 100,
/// "MaxAmount": 1000
/// }
/// ```
///
/// 返回字段说明:
/// - Id: 储扣记录ID
/// - DeductType: 扣减类型
/// - DeductTypeName: 扣减类型名称
/// - BillingId: 开单ID
/// - Amount: 合计金额
/// - ItemName: 品项名称
/// - ItemCategory: 品项分类(医美/科美/生美)
/// - BillingDate: 开单日期
/// - MemberName: 客户名称
/// - MemberPhone: 客户手机号
/// - StoreName: 门店名称
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>分页的储扣列表</returns>
/// <response code="200">成功返回分页的储扣列表</response>
/// <response code="500">服务器错误</response>
[HttpGet("deduct-list")]
public async Task<dynamic> GetDeductList([FromQuery] LqKdDeductinfoListQueryInput input)
{
try
{
var sidx = string.IsNullOrEmpty(input.sidx) ? "CreateTime" : input.sidx;
// 构建基础查询:储扣信息 JOIN 开单记录 JOIN 客户信息 JOIN 门店信息
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
3924
3925
3926
3927
3928
|
var baseQuery = _db.Queryable<LqKdDeductinfoEntity, LqKdKdjlbEntity, LqKhxxEntity, LqMdxxEntity>(
(deduct, billing, member, store) =>
deduct.BillingId == billing.Id &&
billing.Kdhy == member.Id &&
billing.Djmd == store.Id)
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
|
.WhereIF(!string.IsNullOrEmpty(input.DeductType), (deduct, billing, member, store) => deduct.DeductType == input.DeductType)
.WhereIF(!string.IsNullOrEmpty(input.DeductId), (deduct, billing, member, store) => deduct.DeductId == input.DeductId)
.WhereIF(!string.IsNullOrEmpty(input.BillingId), (deduct, billing, member, store) => deduct.BillingId == input.BillingId)
.WhereIF(input.MinAmount.HasValue, (deduct, billing, member, store) => deduct.Amount >= input.MinAmount.Value)
.WhereIF(input.MaxAmount.HasValue, (deduct, billing, member, store) => deduct.Amount <= input.MaxAmount.Value)
.WhereIF(input.IsEffective.HasValue, (deduct, billing, member, store) => deduct.IsEffective == input.IsEffective.Value)
.WhereIF(!string.IsNullOrEmpty(input.ItemName), (deduct, billing, member, store) => deduct.ItemName != null && deduct.ItemName.Contains(input.ItemName))
.WhereIF(!string.IsNullOrEmpty(input.ItemId), (deduct, billing, member, store) => deduct.ItemId == input.ItemId)
.WhereIF(input.MinUnitPrice.HasValue, (deduct, billing, member, store) => deduct.UnitPrice >= input.MinUnitPrice.Value)
.WhereIF(input.MaxUnitPrice.HasValue, (deduct, billing, member, store) => deduct.UnitPrice <= input.MaxUnitPrice.Value)
.WhereIF(input.StartCreateTime.HasValue, (deduct, billing, member, store) => deduct.CreateTime >= input.StartCreateTime.Value)
.WhereIF(input.EndCreateTime.HasValue, (deduct, billing, member, store) => deduct.CreateTime <= input.EndCreateTime.Value)
.WhereIF(!string.IsNullOrEmpty(input.keyword), (deduct, billing, member, store) =>
(deduct.ItemName != null && deduct.ItemName.Contains(input.keyword)) ||
(member.Khmc != null && member.Khmc.Contains(input.keyword)) ||
(member.Sjh != null && member.Sjh.Contains(input.keyword)) ||
(billing.Id != null && billing.Id.Contains(input.keyword)));
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
3948
|
// 查询并分页,使用子查询获取开单类型
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3949
|
// 优先使用储扣记录表中的开单时间,如果为空则使用开单记录表中的开单时间
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
|
var data = await baseQuery.Select((deduct, billing, member, store) => new LqKdDeductinfoListOutput
{
Id = deduct.Id ?? "",
DeductType = deduct.DeductType ?? "",
DeductId = deduct.DeductId ?? "",
BillingId = deduct.BillingId ?? "",
Amount = deduct.Amount,
IsEffective = deduct.IsEffective,
UnitPrice = deduct.UnitPrice,
ItemName = deduct.ItemName ?? "",
ItemId = deduct.ItemId ?? "",
CreateTime = deduct.CreateTime,
ProjectNumber = deduct.ProjectNumber,
ItemCategory = deduct.ItemCategory ?? "",
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3964
|
BillingDate = deduct.BillingTime ?? billing.Kdrq, // 优先使用储扣记录表中的开单时间
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
3965
3966
3967
3968
|
MemberId = billing.Kdhy ?? "",
MemberName = member.Khmc ?? "",
MemberPhone = member.Sjh ?? "",
StoreId = billing.Djmd ?? "",
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
3969
|
StoreName = store.Dm ?? "",
|
3d98506d
“wangming”
feat: 增强合同管理功能
|
3970
|
TimePeriod = deduct.BillingTime ?? billing.Kdrq, // 优先使用储扣记录表中的开单时间
|
910e21a0
“wangming”
修复开单记录汇总筛选逻辑:当传入筛...
|
3971
3972
3973
3974
|
BillingType = SqlFunc.Subqueryable<LqKdPxmxEntity>()
.Where(pxmx => pxmx.Id == deduct.DeductId && pxmx.Px == deduct.ItemId)
.Select(pxmx => pxmx.SourceType),
CooperationInstitution = billing.Hgjg ?? ""
|
404cbc89
“wangming”
完善升单类型判断逻辑和储扣列表功能
|
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
|
}).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqKdDeductinfoListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
_logger.LogError(ex, $"获取储扣列表失败: {ex.ToString()}");
throw NCCException.Oh(ErrorCode.COM1005, $"获取储扣列表失败: {ex.Message}");
}
}
#endregion
|
273e501a
“wangming”
修复产品上下架功能;修复门店每日统...
|
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
|
#region 批量处理历史开单数据的升单类型
/// <summary>
/// 批量处理历史开单数据的升单类型
/// </summary>
/// <remarks>
/// 批量更新历史开单记录的升单类型字段(升生美、升科美、升医美)
///
/// 处理逻辑:
/// 1. 查询所有有效的开单记录
/// 2. 对于每条开单记录,应用升单判断逻辑:
/// - 判断当前开单是否包含医美/科美/生美品项
/// - 判断该会员在当前开单日期之前是否有对应类型的开单记录(重要:只看该开单之前的记录)
/// - 更新升单类型字段
/// 3. 批量更新开单记录
///
/// 升单判断规则:
/// - 升医美:当前开单包含医美品项 + 该会员在当前开单日期之前有医美类型的开单记录 + 当前开单医美品项金额>=1000
/// - 升科美:当前开单包含科美品项 + 该会员在当前开单日期之前有科美类型的开单记录
/// - 升生美:当前开单包含生美品项 + 该会员在当前开单日期之前有生美类型的开单记录
/// </remarks>
/// <returns>处理结果,包含处理的记录数和成功数</returns>
/// <response code="200">处理成功</response>
/// <response code="500">服务器错误</response>
[HttpPost("batch-update-upgrade-type")]
public async Task<dynamic> BatchUpdateUpgradeType()
{
try
{
// 1. 查询所有有效的开单记录
var billingList = await _db.Queryable<LqKdKdjlbEntity>().Where(x => x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
if (!billingList.Any())
{
return new { success = true, message = "没有需要处理的开单记录", totalCount = 0, successCount = 0 };
}
_logger.LogInformation($"找到 {billingList.Count} 条开单记录需要处理");
// 2. 批量查询关联数据
var billingIds = billingList.Select(x => x.Id).ToList();
var memberIds = billingList.Select(x => x.Kdhy).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
// 查询所有品项明细
var pxmxList = await _db.Queryable<LqKdPxmxEntity>().Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
// 查询所有项目资料(用于获取品项分类)
var itemIds = pxmxList.Where(x => !string.IsNullOrEmpty(x.Px)).Select(x => x.Px).Distinct().ToList();
var itemCategoryDict = new Dictionary<string, string>();
if (itemIds.Any())
{
var itemCategories = await _db.Queryable<LqXmzlEntity>().Where(x => itemIds.Contains(x.Id) && x.IsEffective == StatusEnum.有效.GetHashCode()).Select(x => new { x.Id, x.Qt2 }).ToListAsync();
itemCategoryDict = itemCategories.ToDictionary(k => k.Id, v => v.Qt2 ?? "");
}
// 按开单ID分组品项明细
var pxmxGrouped = pxmxList.GroupBy(x => x.Glkdbh).ToDictionary(g => g.Key, g => g.ToList());
// 3. 批量处理,每批500条
const int batchSize = 500;
var totalBatches = (int)Math.Ceiling((double)billingList.Count / batchSize);
var successCount = 0;
var updateList = new List<LqKdKdjlbEntity>();
for (int batchIndex = 0; batchIndex < totalBatches; batchIndex++)
{
var batchBillingList = billingList.Skip(batchIndex * batchSize).Take(batchSize).ToList();
foreach (var billing in batchBillingList)
{
try
{
// 获取该开单的品项明细
var currentPxmxList = pxmxGrouped.ContainsKey(billing.Id) ? pxmxGrouped[billing.Id] : new List<LqKdPxmxEntity>();
if (!currentPxmxList.Any())
{
// 如果没有品项明细,设置为"否"
billing.UpgradeMedicalBeauty = "否";
billing.UpgradeTechBeauty = "否";
billing.UpgradeLifeBeauty = "否";
updateList.Add(billing);
continue;
}
// 判断当前开单是否包含医美/科美/生美品项
var hasMedicalItem = currentPxmxList.Any(x =>
!string.IsNullOrEmpty(x.Px) && itemCategoryDict.ContainsKey(x.Px) && itemCategoryDict[x.Px] == "医美");
var medicalItemAmount = currentPxmxList
.Where(x => !string.IsNullOrEmpty(x.Px) && itemCategoryDict.ContainsKey(x.Px) && itemCategoryDict[x.Px] == "医美")
.Sum(x => x.ActualPrice);
var hasTechItem = currentPxmxList.Any(x =>
!string.IsNullOrEmpty(x.Px) && itemCategoryDict.ContainsKey(x.Px) && itemCategoryDict[x.Px] == "科美");
var hasLifeItem = currentPxmxList.Any(x =>
!string.IsNullOrEmpty(x.Px) && itemCategoryDict.ContainsKey(x.Px) && itemCategoryDict[x.Px] == "生美");
// 判断该会员在当前开单日期之前是否有对应类型的开单记录
if (!string.IsNullOrEmpty(billing.Kdhy) && billing.Kdrq != null)
{
var currentBillingDate = billing.Kdrq.Value;
// 查询该会员在当前开单日期之前的开单记录
var previousBillingIds = await _db.Queryable<LqKdKdjlbEntity>()
.Where(x => x.Kdhy == billing.Kdhy
&& x.IsEffective == StatusEnum.有效.GetHashCode()
&& x.Kdrq < currentBillingDate)
.Select(x => x.Id)
.ToListAsync();
if (previousBillingIds.Any())
{
// 查询这些开单的品项明细
var previousPxmxList = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => previousBillingIds.Contains(x.Glkdbh)
&& x.IsEffective == StatusEnum.有效.GetHashCode()
&& x.ActualPrice > 0
&& x.Px != "61")
.Select(x => x.ItemCategory)
.Distinct()
.ToListAsync();
var hasPreviousMedical = previousPxmxList.Contains("医美");
var hasPreviousTech = previousPxmxList.Contains("科美");
var hasPreviousLife = previousPxmxList.Contains("生美");
// 判断升医美
billing.UpgradeMedicalBeauty = (hasMedicalItem && hasPreviousMedical && medicalItemAmount >= 1000) ? "是" : "否";
// 判断升科美
billing.UpgradeTechBeauty = (hasTechItem && hasPreviousTech) ? "是" : "否";
// 判断升生美
billing.UpgradeLifeBeauty = (hasLifeItem && hasPreviousLife) ? "是" : "否";
}
else
{
billing.UpgradeMedicalBeauty = "否";
billing.UpgradeTechBeauty = "否";
billing.UpgradeLifeBeauty = "否";
}
}
else
{
billing.UpgradeMedicalBeauty = "否";
billing.UpgradeTechBeauty = "否";
billing.UpgradeLifeBeauty = "否";
}
updateList.Add(billing);
}
catch (Exception ex)
{
_logger.LogError(ex, $"处理开单记录 {billing.Id} 失败: {ex.Message}");
}
}
// 批量更新
if (updateList.Any())
{
await _db.Updateable(updateList)
.UpdateColumns(it => new { it.UpgradeMedicalBeauty, it.UpgradeTechBeauty, it.UpgradeLifeBeauty })
.ExecuteCommandAsync();
successCount += updateList.Count;
updateList.Clear();
}
_logger.LogInformation($"已处理 {Math.Min((batchIndex + 1) * batchSize, billingList.Count)} / {billingList.Count} 条记录");
}
_logger.LogInformation($"批量处理完成,共处理 {billingList.Count} 条记录,成功 {successCount} 条");
return new
{
success = true,
message = "批量处理完成",
totalCount = billingList.Count,
successCount = successCount
};
}
catch (Exception ex)
{
_logger.LogError(ex, $"批量处理历史开单数据的升单类型失败: {ex.ToString()}");
throw NCCException.Oh(ErrorCode.COM1005, $"批量处理历史开单数据的升单类型失败: {ex.Message}");
}
}
#endregion
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
|
#region 清空欠款
/// <summary>
/// 清空欠款(减免剩余欠款)
/// </summary>
/// <remarks>
/// 返回参数说明:
/// - billingId: 开单ID
/// - original: 原始数据(zdyj-整单业绩, qk-欠款, paidDebt-已交欠款, remainingDebt-剩余欠款)
/// - updated: 更新后数据(zdyj-整单业绩, qk-欠款, paidDebt-已交欠款, remainingDebt-剩余欠款)
/// - reducedAmount: 减免金额
/// </remarks>
/// <param name="id">开单记录ID</param>
/// <returns>操作结果</returns>
/// <response code="200">成功清空欠款</response>
/// <response code="400">参数错误或无剩余欠款</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器错误</response>
[HttpPost("clear-debt/{id}")]
public async Task<dynamic> ClearDebt(string id)
{
try
{
// 1. 参数验证
if (string.IsNullOrEmpty(id))
{
throw NCCException.Oh("开单ID不能为空");
}
// 2. 查询开单记录
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh("开单记录不存在");
}
// 3. 验证开单是否有效
if (entity.IsEffective != StatusEnum.有效.GetHashCode())
{
throw NCCException.Oh("开单记录已作废,无法清空欠款");
}
// 4. 计算剩余欠款
var remainingDebt = entity.Qk - entity.PaidDebt;
// 5. 验证是否有剩余欠款
if (remainingDebt <= 0)
{
return new
{
billingId = id,
totalDebt = entity.Qk,
paidDebt = entity.PaidDebt,
remainingDebt = remainingDebt,
message = "该开单无剩余欠款,无需清空"
};
}
// 6. 记录原始数据(用于返回)
var originalZdyj = entity.Zdyj;
var originalQk = entity.Qk;
// 7. 执行欠款减免
// 从整单业绩中减去剩余欠款
entity.Zdyj = entity.Zdyj - remainingDebt;
// 欠款金额调整为已交金额(让剩余欠款归零)
entity.Qk = entity.PaidDebt;
// 更新时间
entity.UpdateTime = DateTime.Now;
// 8. 更新数据库
await _db.Updateable(entity).UpdateColumns(it => new { it.Zdyj, it.Qk, it.UpdateTime }).ExecuteCommandAsync();
// 9. 返回结果
return new
{
billingId = id,
original = new
{
zdyj = originalZdyj,
qk = originalQk,
paidDebt = entity.PaidDebt,
remainingDebt = remainingDebt
},
updated = new
{
zdyj = entity.Zdyj,
qk = entity.Qk,
paidDebt = entity.PaidDebt,
remainingDebt = entity.Qk - entity.PaidDebt
},
reducedAmount = remainingDebt
};
}
catch (Exception ex)
{
_logger.LogError(ex, $"清空欠款失败 - 开单ID: {id}");
throw NCCException.Oh($"清空欠款失败: {ex.Message}");
}
}
#endregion
|
96009bc9
hexiaodong
hxd
|
4265
4266
|
}
}
|