d98270e2
“wangming”
Enhance LqEventSe...
|
1
2
3
4
5
6
7
8
9
10
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using NCC.ClayObject;
using NCC.Common.Configuration;
using NCC.Common.Core.Manager;
|
96009bc9
hexiaodong
hxd
|
11
12
13
|
using NCC.Common.Enum;
using NCC.Common.Extension;
using NCC.Common.Filter;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
14
15
16
|
using NCC.Common.Helper;
using NCC.Common.Model.NPOI;
using NCC.DataEncryption;
|
96009bc9
hexiaodong
hxd
|
17
18
|
using NCC.Dependency;
using NCC.DynamicApiController;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
19
|
using NCC.Extend.Entitys.Dto.LqXhHyhk;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
20
21
22
|
using NCC.Extend.Entitys.Dto.LqXhJksyj;
using NCC.Extend.Entitys.Dto.LqXhKjbsyj;
using NCC.Extend.Entitys.Dto.LqXhPxmx;
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
23
|
using NCC.Extend.Entitys.Enum;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
24
25
26
|
using NCC.Extend.Entitys.lq_kd_kdjlb;
using NCC.Extend.Entitys.lq_kd_pxmx;
using NCC.Extend.Entitys.lq_khxx;
|
efde7d04
“wangming”
更新多个文件,删除不再使用的CSS...
|
27
28
29
30
|
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_jksyj;
using NCC.Extend.Entitys.lq_xh_kjbsyj;
using NCC.Extend.Entitys.lq_xh_pxmx;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
31
32
|
using NCC.Extend.Interfaces.LqXhHyhk;
using NCC.FriendlyException;
|
96009bc9
hexiaodong
hxd
|
33
|
using NCC.JsonSerialization;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
34
35
|
using SqlSugar;
using Yitter.IdGenerator;
|
96009bc9
hexiaodong
hxd
|
36
37
38
39
|
namespace NCC.Extend.LqXhHyhk
{
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
40
|
/// 耗卡记录表服务
|
96009bc9
hexiaodong
hxd
|
41
|
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
42
|
[ApiDescriptionSettings(Tag = "绿纤耗卡记录表服务", Name = "LqXhHyhk", Order = 200, Groups = new[] { "Default" })]
|
96009bc9
hexiaodong
hxd
|
43
44
45
46
47
48
49
50
51
|
[Route("api/Extend/[controller]")]
public class LqXhHyhkService : ILqXhHyhkService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<LqXhHyhkEntity> _lqXhHyhkRepository;
private readonly ISqlSugarRepository<LqXhJksyjEntity> _lqXhJksyjRepository;
private readonly ISqlSugarRepository<LqXhKjbsyjEntity> _lqXhKjbsyjRepository;
private readonly ISqlSugarRepository<LqXhPxmxEntity> _lqXhPxmxRepository;
private readonly SqlSugarScope _db;
private readonly IUserManager _userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
52
|
private readonly ILogger<LqXhHyhkService> _logger;
|
96009bc9
hexiaodong
hxd
|
53
54
55
56
57
58
59
60
61
|
/// <summary>
/// 初始化一个<see cref="LqXhHyhkService"/>类型的新实例
/// </summary>
public LqXhHyhkService(
ISqlSugarRepository<LqXhHyhkEntity> lqXhHyhkRepository,
ISqlSugarRepository<LqXhJksyjEntity> lqXhJksyjRepository,
ISqlSugarRepository<LqXhKjbsyjEntity> lqXhKjbsyjRepository,
ISqlSugarRepository<LqXhPxmxEntity> lqXhPxmxRepository,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
62
|
IUserManager userManager,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
63
64
|
ILogger<LqXhHyhkService> logger
)
|
96009bc9
hexiaodong
hxd
|
65
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
66
|
_lqXhHyhkRepository = lqXhHyhkRepository;
|
96009bc9
hexiaodong
hxd
|
67
68
69
70
71
|
_db = _lqXhHyhkRepository.Context;
_lqXhJksyjRepository = lqXhJksyjRepository;
_lqXhKjbsyjRepository = lqXhKjbsyjRepository;
_lqXhPxmxRepository = lqXhPxmxRepository;
_userManager = userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
72
|
_logger = logger;
|
96009bc9
hexiaodong
hxd
|
73
74
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
75
|
#region 获取会员耗卡
|
96009bc9
hexiaodong
hxd
|
76
77
78
|
/// <summary>
/// 获取会员耗卡
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
79
80
81
|
/// <remarks>
/// 获取耗卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 按照耗卡的完整格式返回数据,不包含汇总信息
|
d98270e2
“wangming”
Enhance LqEventSe...
|
82
|
///
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
83
84
85
86
87
88
89
90
91
92
93
|
/// 返回数据结构:
/// - 主表信息:耗卡基础信息、门店信息、会员信息等
/// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
/// - 健康师业绩列表:按品项关联的健康师业绩信息
/// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
/// </remarks>
/// <param name="id">耗卡记录主键ID</param>
/// <returns>耗卡记录完整信息</returns>
/// <response code="200">查询成功</response>
/// <response code="404">耗卡记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
94
95
96
|
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
97
98
99
100
101
102
103
104
105
106
|
try
{
// 1. 查询主表信息
var entity = await _db.Queryable<LqXhHyhkEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在");
}
var output = entity.Adapt<LqXhHyhkInfoOutput>();
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
107
108
109
110
|
//获取会员信息
var MemberInfo = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == entity.Hy);
output.hymc = MemberInfo.Khmc;
output.memberPhone = MemberInfo.Sjh;
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
111
112
|
// 2. 查询品项明细列表
|
b45d55f7
“wangming”
Refactor LqEventS...
|
113
|
var lqXhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(w => w.ConsumeInfoId == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
114
115
|
// 3. 查询健康师业绩列表
|
d98270e2
“wangming”
Enhance LqEventSe...
|
116
|
var lqXhJksyjList = await _db.Queryable<LqXhJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
117
118
|
// 4. 查询科技部老师业绩列表
|
d98270e2
“wangming”
Enhance LqEventSe...
|
119
|
var lqXhKjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
120
121
122
123
124
125
126
127
|
// 5. 构建品项明细输出,每个品项关联对应的业绩信息
var pxmxOutputList = new List<LqXhPxmxInfoOutput>();
foreach (var pxmx in lqXhPxmxList)
{
var pxmxOutput = new LqXhPxmxInfoOutput
{
id = pxmx.Id,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
128
129
|
consumeInfoId = pxmx.ConsumeInfoId,
billingItemId = pxmx.BillingItemId,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
130
131
132
|
px = pxmx.Px,
pxmc = pxmx.Pxmc,
pxjg = pxmx.Pxjg,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
133
134
135
|
memberId = pxmx.MemberId,
createTime = pxmx.CreateTIme,
projectNumber = pxmx.ProjectNumber,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
136
|
sourceType = pxmx.SourceType,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
137
|
totalPrice = pxmx.TotalPrice,
|
d7925aaa
“wangming”
星期五了,下班咯
|
138
|
isEffective = pxmx.IsEffective,
|
e09804e2
“wangming”
fix: 更新消耗服务相关代码
|
139
140
|
originalProjectNumber = pxmx.OriginalProjectNumber,
overtimeProjectNumber = pxmx.OvertimeProjectNumber
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
141
142
143
144
145
146
147
148
149
150
151
152
|
};
// 关联该品项的健康师业绩
var jksyjForPx = lqXhJksyjList.Where(j => j.Kdpxid == pxmx.Id).ToList();
pxmxOutput.lqXhJksyjList = jksyjForPx.Adapt<List<LqXhJksyjInfoOutput>>();
// 关联该品项的科技部老师业绩
var kjbsyjForPx = lqXhKjbsyjList.Where(k => k.Hkpxid == pxmx.Id).ToList();
pxmxOutput.lqXhKjbsyjList = kjbsyjForPx.Adapt<List<LqXhKjbsyjInfoOutput>>();
pxmxOutputList.Add(pxmxOutput);
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
153
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
154
155
|
// 6. 设置输出结果
output.lqXhPxmxList = pxmxOutputList;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
156
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
157
158
159
|
// 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
output.lqXhJksyjList = lqXhJksyjList.Adapt<List<LqXhJksyjInfoOutput>>();
output.lqXhKjbsyjList = lqXhKjbsyjList.Adapt<List<LqXhKjbsyjInfoOutput>>();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
160
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
161
162
163
164
165
166
167
|
return output;
}
catch (Exception ex)
{
_logger.LogError(ex, "获取耗卡记录失败,ID:{Id}", id);
throw NCCException.Oh(ErrorCode.COM1000, "获取耗卡记录失败");
}
|
96009bc9
hexiaodong
hxd
|
168
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
169
|
#endregion
|
96009bc9
hexiaodong
hxd
|
170
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
171
|
#region 获取会员耗卡列表
|
96009bc9
hexiaodong
hxd
|
172
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
173
174
175
176
|
/// 获取会员耗卡列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
177
178
179
180
181
182
183
184
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqXhHyhkListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
List<string> queryHksj = input.hksj != null ? input.hksj.Split(',').ToObeject<List<string>>() : null;
DateTime? startHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.First()) : null;
DateTime? endHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.Last()) : null;
var data = await _db.Queryable<LqXhHyhkEntity>()
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
185
|
.WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Hymc.Contains(input.keyword) || p.Hyzh.Contains(input.keyword) || p.MemberPhone.Contains(input.keyword))
|
96009bc9
hexiaodong
hxd
|
186
187
188
189
190
191
192
193
|
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
.WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
.WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
.WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
.WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
.WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
.WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
|
96009bc9
hexiaodong
hxd
|
194
195
196
197
|
.WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
.WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
.WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
198
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
199
|
.Select(it => new LqXhHyhkListOutput
|
96009bc9
hexiaodong
hxd
|
200
201
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
202
203
204
205
206
|
md = it.Md,
mdbh = it.Mdbh,
mdmc = it.Mdmc,
hy = it.Hy,
hyzh = it.Hyzh,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
207
|
hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
208
|
gklx = it.Gklx,
|
d7925aaa
“wangming”
星期五了,下班咯
|
209
210
|
xfje = SqlFunc.ToString(it.Xfje),
sgfy = SqlFunc.ToString(it.Sgfy),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
211
212
213
|
sfykjb = it.Sfykjb,
hksj = it.Hksj,
czry = it.Czry,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
214
215
|
memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Sjh),
isEffective = it.IsEffective,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
216
217
218
219
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
// 获取当前页的耗卡记录ID列表
var consumeIds = data.list.Select(x => x.id).ToList();
// 批量查询耗卡明细
var consumeDetails = new List<LqXhPxmxInfoOutput>();
if (consumeIds.Any())
{
consumeDetails = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqXhPxmxInfoOutput
{
id = x.Id,
consumeInfoId = x.ConsumeInfoId,
billingItemId = x.BillingItemId,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
memberId = x.MemberId,
createTime = x.CreateTIme,
projectNumber = x.ProjectNumber,
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
241
242
|
originalProjectNumber = x.OriginalProjectNumber,
overtimeProjectNumber = x.OvertimeProjectNumber,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
243
244
|
sourceType = x.SourceType,
totalPrice = x.TotalPrice,
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
245
|
isEffective = x.IsEffective,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
|
})
.ToListAsync();
}
// 按耗卡记录ID分组耗卡明细
var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个耗卡记录分配耗卡明细
foreach (var item in data.list)
{
item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
? consumeDetailsGrouped[item.id]
: new List<LqXhPxmxInfoOutput>();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
262
|
return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
263
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
264
|
#endregion
|
96009bc9
hexiaodong
hxd
|
265
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
266
|
#region 新建会员耗卡
|
96009bc9
hexiaodong
hxd
|
267
268
269
|
/// <summary>
/// 新建会员耗卡
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
270
271
|
/// <remarks>
/// 创建会员耗卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
d98270e2
“wangming”
Enhance LqEventSe...
|
272
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
|
/// 示例请求:
/// ```json
/// {
/// "hyid": "会员ID",
/// "hkmd": "耗卡门店",
/// "hksj": "2025-01-11",
/// "lqXhPxmxList": [
/// {
/// "px": "品项编号",
/// "pxmc": "品项名称",
/// "pxjg": 100.00,
/// "projectNumber": 1,
/// "xfzs": "否",
/// "lqXhJksyjList": [
/// {
/// "jks": "健康师",
/// "jksxm": "健康师姓名",
/// "jksyj": "100"
/// }
/// ]
/// }
/// ]
/// }
/// ```
|
d98270e2
“wangming”
Enhance LqEventSe...
|
297
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
298
299
300
301
302
303
304
305
306
307
|
/// 参数说明:
/// - hyid: 会员ID
/// - hkmd: 耗卡门店
/// - lqXhPxmxList: 耗卡品项明细列表
/// </remarks>
/// <param name="input">会员耗卡创建参数</param>
/// <returns>无返回值</returns>
/// <response code="200">创建成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
308
309
310
311
|
[HttpPost("")]
public async Task Create([FromBody] LqXhHyhkCrInput input)
{
var userInfo = await _userManager.GetUserInfo();
|
fc259a33
“wangming”
feat: 添加消耗功能加班相关字...
|
312
|
//首先判断当前时间是否是加班时间
|
96009bc9
hexiaodong
hxd
|
313
314
|
var entity = input.Adapt<LqXhHyhkEntity>();
entity.Id = YitIdHelper.NextId().ToString();
|
96009bc9
hexiaodong
hxd
|
315
|
entity.Czry = _userManager.UserId;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
316
|
entity.MemberPhone = _db.Queryable<LqKhxxEntity>().Where(w => w.Id == entity.Hy).First().Sjh;
|
d98270e2
“wangming”
Enhance LqEventSe...
|
317
|
entity.CreateTime = DateTime.Now;
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
318
319
|
entity.IsEffective = StatusEnum.有效.GetHashCode();
entity.UpdateTime = DateTime.Now;
|
fc259a33
“wangming”
feat: 添加消耗功能加班相关字...
|
320
|
entity.OvertimeCoefficient = input.overtimeCoefficient ?? 0;
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
321
322
323
324
325
|
entity.OriginalSgfy = input.sgfy;
//加班手工费 = 原始手工费 * 加班系数
entity.OvertimeSgfy = entity.OriginalSgfy * entity.OvertimeCoefficient;
//最终手工费 = 原始手工费 + 加班手工费
entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
|
96009bc9
hexiaodong
hxd
|
326
327
|
try
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
328
|
// 开启事务
|
96009bc9
hexiaodong
hxd
|
329
|
_db.BeginTran();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
330
|
// 新增会员耗卡记录
|
96009bc9
hexiaodong
hxd
|
331
|
var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
332
333
334
335
336
337
|
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqXhPxmxEntity>();
var allJksyjEntities = new List<LqXhJksyjEntity>();
var allKjbsyjEntities = new List<LqXhKjbsyjEntity>();
// 处理品项明细列表
if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any())
|
96009bc9
hexiaodong
hxd
|
338
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
339
|
foreach (var item in input.lqXhPxmxList)
|
96009bc9
hexiaodong
hxd
|
340
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
341
342
343
344
|
// 创建品项明细实体
var lqXhPxmxEntity = new LqXhPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
|
b45d55f7
“wangming”
Refactor LqEventS...
|
345
346
|
ConsumeInfoId = newEntity.Id,
BillingItemId = item.billingItemId,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
347
348
|
CreateTIme = DateTime.Now,
MemberId = entity.Hy,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
349
350
351
|
OriginalProjectNumber = item.projectNumber ?? 0,
OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)),
ProjectNumber = (decimal)((item.projectNumber ?? 0) + (entity.OvertimeCoefficient * (item.projectNumber ?? 0))),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
352
353
354
355
|
TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
356
|
SourceType = item.sourceType,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
357
358
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
359
360
|
};
allPxmxEntities.Add(lqXhPxmxEntity);
|
d98270e2
“wangming”
Enhance LqEventSe...
|
361
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
362
363
364
365
366
|
// 收集该品项关联的健康师业绩
if (item.lqXhJksyjList != null && item.lqXhJksyjList.Any())
{
foreach (var ijks_tem in item.lqXhJksyjList)
{
|
d98270e2
“wangming”
Enhance LqEventSe...
|
367
368
369
370
371
372
373
374
375
376
377
378
|
allJksyjEntities.Add(
new LqXhJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = DateTime.Now,
JsjId = ijks_tem.jsjId,
Kdpxid = lqXhPxmxEntity.Id,
|
dc3e0c1c
“wangming”
fix: 修复健康师业绩Labor...
|
379
380
381
|
OriginalLaborCost = ijks_tem.laborCost,
OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
LaborCost = (decimal)((ijks_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0))),
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
382
383
|
OriginalKdpxNumber = ijks_tem.kdpxNumber,
OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)),
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
384
385
386
|
KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0),
IsAccompanied = ijks_tem.isAccompanied,
AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
387
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
d98270e2
“wangming”
Enhance LqEventSe...
|
388
389
|
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
390
391
|
}
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
392
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
393
394
395
396
397
|
// 收集该品项关联的科技部老师业绩
if (item.lqXhKjbsyjList != null && item.lqXhKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqXhKjbsyjList)
{
|
d98270e2
“wangming”
Enhance LqEventSe...
|
398
399
400
401
402
403
404
405
406
407
408
|
allKjbsyjEntities.Add(
new LqXhKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = DateTime.Now,
Hkpxid = lqXhPxmxEntity.Id,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
409
410
411
412
413
414
415
|
OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)),
HdpxNumber = (decimal)((ikjbs_tem.hdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0))),
OriginalLaborCost = ikjbs_tem.laborCost,
OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0)),
LaborCost = (decimal)((ikjbs_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0))),
IsEffective = StatusEnum.有效.GetHashCode(),
|
d98270e2
“wangming”
Enhance LqEventSe...
|
416
417
|
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
418
419
|
}
}
|
96009bc9
hexiaodong
hxd
|
420
|
}
|
96009bc9
hexiaodong
hxd
|
421
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
422
423
|
// 批量插入品项明细
if (allPxmxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
424
|
{
|
dac8767e
“wangming”
111111111
|
425
|
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
426
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
427
428
|
// 批量插入健康师业绩
if (allJksyjEntities.Any())
|
96009bc9
hexiaodong
hxd
|
429
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
430
|
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
431
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
432
433
434
435
436
437
|
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
// 提交事务
|
96009bc9
hexiaodong
hxd
|
438
439
|
_db.CommitTran();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
440
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
441
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
442
|
// 回滚事务
|
96009bc9
hexiaodong
hxd
|
443
|
_db.RollbackTran();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
444
445
446
|
Console.WriteLine($"新建会员耗卡失败: {ex.Message}");
Console.WriteLine($"堆栈跟踪: {ex.StackTrace}");
throw NCCException.Oh(ErrorCode.COM1000, $"新建会员耗卡失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
447
448
|
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
449
|
#endregion
|
96009bc9
hexiaodong
hxd
|
450
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
451
|
#region 获取会员耗卡无分页列表
|
96009bc9
hexiaodong
hxd
|
452
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
453
454
455
456
|
/// 获取会员耗卡无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqXhHyhkListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
List<string> queryHksj = input.hksj != null ? input.hksj.Split(',').ToObeject<List<string>>() : null;
DateTime? startHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.First()) : null;
DateTime? endHksj = queryHksj != null ? Ext.GetDateTime(queryHksj.Last()) : null;
var data = await _db.Queryable<LqXhHyhkEntity>()
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
.WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
.WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
.WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
.WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
.WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
.WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
|
96009bc9
hexiaodong
hxd
|
473
474
475
476
|
.WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
.WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
.WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
477
|
.Select(it => new LqXhHyhkListOutput
|
96009bc9
hexiaodong
hxd
|
478
479
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
480
481
482
483
484
|
md = it.Md,
mdbh = it.Mdbh,
mdmc = it.Mdmc,
hy = it.Hy,
hyzh = it.Hyzh,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
485
486
|
hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Sjh),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
487
|
gklx = it.Gklx,
|
d7925aaa
“wangming”
星期五了,下班咯
|
488
489
|
xfje = SqlFunc.ToString(it.Xfje),
sgfy = SqlFunc.ToString(it.Sgfy),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
490
491
492
|
sfykjb = it.Sfykjb,
hksj = it.Hksj,
czry = it.Czry,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
493
494
495
496
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
497
|
return data;
|
96009bc9
hexiaodong
hxd
|
498
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
499
|
#endregion
|
96009bc9
hexiaodong
hxd
|
500
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
501
|
#region 导出会员耗卡
|
96009bc9
hexiaodong
hxd
|
502
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
503
504
505
506
|
/// 导出会员耗卡
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
507
508
509
510
511
512
513
514
515
516
517
518
519
520
|
[HttpGet("Actions/Export")]
public async Task<dynamic> Export([FromQuery] LqXhHyhkListQueryInput input)
{
var userInfo = await _userManager.GetUserInfo();
var exportData = new List<LqXhHyhkListOutput>();
if (input.dataType == 0)
{
var data = Clay.Object(await this.GetList(input));
exportData = data.Solidify<PageResult<LqXhHyhkListOutput>>().list;
}
else
{
exportData = await this.GetNoPagingList(input);
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
521
522
|
List<ParamsModel> paramList =
"[{\"value\":\"耗卡编号\",\"field\":\"id\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"门店编号\",\"field\":\"mdbh\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"会员\",\"field\":\"hy\"},{\"value\":\"会员账号\",\"field\":\"hyzh\"},{\"value\":\"会员名称\",\"field\":\"hymc\"},{\"value\":\"顾客类型\",\"field\":\"gklx\"},{\"value\":\"消费金额\",\"field\":\"xfje\"},{\"value\":\"手工费用\",\"field\":\"sgfy\"},{\"value\":\"是否有科技部\",\"field\":\"sfykjb\"},{\"value\":\"耗卡时间\",\"field\":\"hksj\"},{\"value\":\"操作人员\",\"field\":\"czry\"},]".ToList<ParamsModel>();
|
96009bc9
hexiaodong
hxd
|
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
|
ExcelConfig excelconfig = new ExcelConfig();
excelconfig.FileName = "会员耗卡.xls";
excelconfig.HeadFont = "微软雅黑";
excelconfig.HeadPoint = 10;
excelconfig.IsAllSizeColumn = true;
excelconfig.ColumnModel = new List<ExcelColumnModel>();
List<string> selectKeyList = input.selectKey.Split(',').ToList();
foreach (var item in selectKeyList)
{
var isExist = paramList.Find(p => p.field == item);
if (isExist != null)
{
excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
}
}
var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
ExcelExportHelper<LqXhHyhkListOutput>.Export(exportData, excelconfig, addPath);
var fileName = _userManager.UserId + "|" + addPath + "|xls";
|
d98270e2
“wangming”
Enhance LqEventSe...
|
541
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
542
543
|
return output;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
544
|
#endregion
|
96009bc9
hexiaodong
hxd
|
545
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
546
|
#region 批量删除会员耗卡
|
96009bc9
hexiaodong
hxd
|
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
|
/// <summary>
/// 批量删除会员耗卡
/// </summary>
/// <param name="ids">主键数组</param>
/// <returns></returns>
[HttpPost("batchRemove")]
public async Task BatchRemove([FromBody] List<string> ids)
{
var entitys = await _db.Queryable<LqXhHyhkEntity>().In(it => it.Id, ids).ToListAsync();
if (entitys.Count > 0)
{
try
{
//开启事务
_db.BeginTran();
//批量删除会员耗卡
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
563
|
await _db.Deleteable<LqXhHyhkEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
564
565
|
//清空子表数据
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
566
|
await _db.Deleteable<LqXhJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
567
568
|
//清空子表数据
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
569
|
await _db.Deleteable<LqXhKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
570
571
|
//清空子表数据
|
b45d55f7
“wangming”
Refactor LqEventS...
|
572
|
await _db.Deleteable<LqXhPxmxEntity>().In(u => u.ConsumeInfoId, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
573
574
575
576
577
578
579
580
581
582
583
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1002);
}
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
584
|
#endregion
|
96009bc9
hexiaodong
hxd
|
585
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
586
|
#region 更新会员耗卡
|
96009bc9
hexiaodong
hxd
|
587
|
/// <summary>
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
588
|
/// 更新会员耗卡
|
96009bc9
hexiaodong
hxd
|
589
590
591
592
593
594
595
596
597
598
599
600
|
/// </summary>
/// <param name="id">主键</param>
/// <param name="input">参数</param>
/// <returns></returns>
[HttpPut("{id}")]
public async Task Update(string id, [FromBody] LqXhHyhkUpInput input)
{
var entity = input.Adapt<LqXhHyhkEntity>();
try
{
//开启事务
_db.BeginTran();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
601
602
603
604
605
606
|
//查询记录
var LqXhHyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (LqXhHyhkInfo == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
607
|
entity.UpdateTime = DateTime.Now;
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
608
609
610
|
entity.OvertimeCoefficient = input.overtimeCoefficient;
entity.OriginalSgfy = input.sgfy;
entity.OvertimeSgfy = (decimal)(entity.OvertimeCoefficient * input.sgfy);
|
e09804e2
“wangming”
fix: 更新消耗服务相关代码
|
611
|
entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy;
|
96009bc9
hexiaodong
hxd
|
612
613
614
615
616
|
//更新会员耗卡记录
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
//清空原有数据
await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
617
|
await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
618
|
await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
619
620
621
622
|
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqXhPxmxEntity>();
var allJksyjEntities = new List<LqXhJksyjEntity>();
var allKjbsyjEntities = new List<LqXhKjbsyjEntity>();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
623
624
|
// 处理品项明细列表
if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any())
|
96009bc9
hexiaodong
hxd
|
625
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
626
|
foreach (var item in input.lqXhPxmxList)
|
96009bc9
hexiaodong
hxd
|
627
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
628
629
|
// 创建品项明细实体
var lqXhPxmxEntity = new LqXhPxmxEntity
|
d7925aaa
“wangming”
星期五了,下班咯
|
630
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
631
632
633
634
635
|
Id = YitIdHelper.NextId().ToString(),
ConsumeInfoId = input.id,
BillingItemId = item.billingItemId,
CreateTIme = DateTime.Now,
MemberId = entity.Hy,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
636
|
TotalPrice = item.pxjg * (item.projectNumber ?? 1),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
637
638
639
640
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
641
642
643
644
|
IsEffective = StatusEnum.有效.GetHashCode(),
OriginalProjectNumber = item.projectNumber ?? 0,
OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)),
ProjectNumber = (decimal)((item.projectNumber ?? 0) + (entity.OvertimeCoefficient * (item.projectNumber ?? 0))),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
645
|
};
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
646
|
allPxmxEntities.Add(lqXhPxmxEntity);
|
d98270e2
“wangming”
Enhance LqEventSe...
|
647
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
648
649
650
651
652
|
// 收集该品项关联的健康师业绩
if (item.lqXhJksyjList != null && item.lqXhJksyjList.Any())
{
foreach (var ijks_tem in item.lqXhJksyjList)
{
|
d98270e2
“wangming”
Enhance LqEventSe...
|
653
654
655
656
|
allJksyjEntities.Add(
new LqXhJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
657
|
Glkdbh = input.id,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
658
659
660
661
662
663
664
|
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = DateTime.Now,
JsjId = ijks_tem.jsjId,
Kdpxid = lqXhPxmxEntity.Id,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
665
666
|
OriginalKdpxNumber = ijks_tem.kdpxNumber,
OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)),
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
667
|
KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0),
|
e09804e2
“wangming”
fix: 更新消耗服务相关代码
|
668
669
670
|
OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
LaborCost = ijks_tem.laborCost + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)),
OriginalLaborCost = ijks_tem.laborCost,
|
01cd603c
“wangming”
refactor: 优化加班计算逻...
|
671
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
3ab6f199
“wangming”
feat: 创建门店目标表和总经理...
|
672
673
|
IsAccompanied = ijks_tem.isAccompanied,
AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
674
675
|
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
676
677
|
}
}
|
d98270e2
“wangming”
Enhance LqEventSe...
|
678
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
679
680
681
682
683
|
// 收集该品项关联的科技部老师业绩
if (item.lqXhKjbsyjList != null && item.lqXhKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqXhKjbsyjList)
{
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
|
allKjbsyjEntities.Add(new LqXhKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = input.id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = DateTime.Now,
Hkpxid = lqXhPxmxEntity.Id,
OriginalHdpxNumber = ikjbs_tem.hdpxNumber,
OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)),
HdpxNumber = (decimal)((ikjbs_tem.hdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0))),
OriginalLaborCost = ikjbs_tem.laborCost,
OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0)),
LaborCost = (decimal)((ikjbs_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ikjbs_tem.laborCost ?? 0))),
IsEffective = StatusEnum.有效.GetHashCode(),
});
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
702
703
|
}
}
|
96009bc9
hexiaodong
hxd
|
704
|
}
|
96009bc9
hexiaodong
hxd
|
705
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
706
707
|
// 批量插入品项明细
if (allPxmxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
708
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
709
|
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
710
711
712
713
714
715
716
717
718
719
|
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
720
|
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
721
|
// 提交事务
|
96009bc9
hexiaodong
hxd
|
722
723
724
725
726
727
728
729
730
|
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1001);
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
731
|
#endregion
|
96009bc9
hexiaodong
hxd
|
732
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
733
|
#region 删除会员耗卡
|
96009bc9
hexiaodong
hxd
|
734
735
736
737
738
739
740
741
742
743
744
745
746
|
/// <summary>
/// 删除会员耗卡
/// </summary>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task Delete(string id)
{
var entity = await _db.Queryable<LqXhHyhkEntity>().FirstAsync(p => p.Id == id);
_ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
try
{
//开启事务
_db.BeginTran();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
747
|
|
96009bc9
hexiaodong
hxd
|
748
749
750
751
752
753
754
755
756
757
|
//删除会员耗卡记录
await _db.Deleteable<LqXhHyhkEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
//清空子表数据
await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
//清空子表数据
await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
//清空子表数据
|
b45d55f7
“wangming”
Refactor LqEventS...
|
758
|
await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
759
|
|
96009bc9
hexiaodong
hxd
|
760
761
762
763
764
765
766
767
768
769
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1002);
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
770
|
#endregion
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
|
#region 查询健康师消耗业绩列表
/// <summary>
/// 查询健康师业绩列表
/// </summary>
/// <param name="input">查询参数</param>
/// <returns>分页的健康师业绩列表</returns>
/// <remarks>
/// 查询健康师业绩记录,支持分页和时间筛选
///
/// 示例请求:
/// ```json
/// {
/// "glkdbh": "123456789",
/// "jksId": "健康师ID",
/// "startTime": "2025-01-01T00:00:00",
/// "endTime": "2025-01-31T23:59:59",
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "yjsj",
/// "sort": "desc"
/// }
/// ```
///
/// 参数说明:
/// - glkdbh: 开单记录ID(可选)
/// - jksId: 健康师ID(可选)
/// - startTime: 查询开始时间(可选)
/// - endTime: 查询结束时间(可选)
/// - currentPage: 当前页码
/// - pageSize: 每页大小
/// </remarks>
/// <response code="200">成功获取健康师业绩列表</response>
/// <response code="400">请求参数错误</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("GetJksyjList")]
public async Task<dynamic> GetJksyjList([FromQuery] LqXhJksyjQueryInput input)
{
try
{
var sidx = string.IsNullOrEmpty(input.sidx) ? "yjsj" : input.sidx;
var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort;
var data = await _db.Queryable<LqXhJksyjEntity>()
.WhereIF(!string.IsNullOrEmpty(input.Glkdbh), w => w.Glkdbh == input.Glkdbh)
.WhereIF(!string.IsNullOrEmpty(input.JksId), w => w.Jks == input.JksId)
.WhereIF(input.StartTime.HasValue, w => w.Yjsj >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, w => w.Yjsj <= input.EndTime.Value)
.Where(w => w.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new LqXhJksyjInfoOutput
{
id = it.Id,
glkdbh = it.Glkdbh,
jks = it.Jks,
jksxm = it.Jksxm,
jkszh = it.Jkszh,
jksyj = it.Jksyj.ToString(),
yjsj = it.Yjsj,
jsjId = it.JsjId,
kdpxid = it.Kdpxid,
laborCost = it.LaborCost,
kdpxNumber = it.KdpxNumber,
storeName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Mdmc),
memberId = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hy),
memberName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hymc),
})
.MergeTable()
.OrderBy(sidx + " " + sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqXhJksyjInfoOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
throw NCCException.Oh($"获取健康师业绩列表失败: {ex.Message}");
}
}
#endregion
#region 耗卡记录作废
/// <summary>
/// 耗卡记录作废
/// </summary>
/// <param name="id">耗卡记录ID</param>
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
854
|
/// <param name="remarks">作废备注</param>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
855
856
|
/// <returns></returns>
[HttpPut("CancelCardUsageRecord/{id}")]
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
857
|
public async Task<dynamic> CancelCardUsageRecord(string id, [FromQuery] string remarks = null)
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
858
859
860
861
862
863
864
865
866
867
868
869
870
|
{
try
{
//开启事务
_db.BeginTran();
//查询消耗记录表信息
var LqhyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (LqhyhkInfo == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
}
//更新耗卡记录状态
LqhyhkInfo.IsEffective = StatusEnum.无效.GetHashCode();
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
871
872
|
LqhyhkInfo.UpdateTime = DateTime.Now;
LqhyhkInfo.CancelRemark = remarks;
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
|
await _db.Updateable(LqhyhkInfo).ExecuteCommandAsync();
//更新品项明细表状态
await _db.Updateable<LqXhPxmxEntity>().SetColumns(it => new LqXhPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.ConsumeInfoId == id).ExecuteCommandAsync();
//更新健康师业绩表状态
await _db.Updateable<LqXhJksyjEntity>().SetColumns(it => new LqXhJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync();
//更新科技部老师业绩表状态
await _db.Updateable<LqXhKjbsyjEntity>().SetColumns(it => new LqXhKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync();
//关闭事务
_db.CommitTran();
return LqhyhkInfo;
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1001);
}
}
#endregion
#region 获取某个会员的耗卡记录
/// <summary>
/// 获取某个会员的耗卡记录(分页)
/// </summary>
/// <param name="input">查询参数</param>
/// <returns></returns>
[HttpGet("GetMemberCardUsageRecord")]
public async Task<dynamic> GetMemberCardUsageRecord([FromQuery] LqXhHyhkMemberCardUsageQueryInput input)
{
try
{
// 参数验证
if (string.IsNullOrEmpty(input.MemberId))
{
throw NCCException.Oh("会员ID不能为空");
}
// 分页查询会员耗卡记录
var data = await _db.Queryable<LqXhHyhkEntity>()
.Where(p => p.Hy == input.MemberId && p.IsEffective == StatusEnum.有效.GetHashCode())
.WhereIF(!string.IsNullOrEmpty(input.StoreId), p => p.Md == input.StoreId)
.WhereIF(input.StartTime.HasValue, p => p.Hksj >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, p => p.Hksj <= input.EndTime.Value)
.Select(it => new LqXhHyhkMemberCardUsageOutput
{
Id = it.Id,
MemberId = it.Hy,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
919
|
MemberName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == it.Hy).Select(w => w.Khmc),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
|
StoreId = it.Md,
StoreName = it.Mdmc,
UsageDate = it.Hksj,
TotalAmount = it.Xfje,
Remarks = it.SignatureFile,
CreateTime = it.CreateTime
})
.MergeTable()
.OrderBy((input.sidx == null ? "UsageDate" : input.sidx) + " " + (input.sort ?? "desc"))
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页耗卡记录ID,直接查询对应的品项明细
if (data.list.Any())
{
var recordIds = data.list.Select(r => r.Id).ToList();
// 批量查询当前页记录的所有品项明细
var itemDetails = await _db.Queryable<LqXhPxmxEntity>().Where(w => recordIds.Contains(w.ConsumeInfoId) && w.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
// 按耗卡记录ID分组明细
var detailsGrouped = itemDetails.GroupBy(d => d.ConsumeInfoId).ToDictionary(g => g.Key, g => g.ToList());
// 为每个记录添加品项明细
foreach (var record in data.list)
{
if (detailsGrouped.ContainsKey(record.Id))
{
record.ItemDetails = detailsGrouped[record.Id].Select(detail => new LqXhHyhkMemberCardUsageItemDetail
{
Id = detail.Id,
ItemId = detail.Px,
ItemName = detail.Pxmc,
UnitPrice = detail.Pxjg,
ProjectNumber = detail.ProjectNumber,
TotalPrice = detail.TotalPrice,
SourceType = detail.SourceType,
CreateTime = detail.CreateTIme
}).ToList();
}
}
}
return PageResult<LqXhHyhkMemberCardUsageOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
throw NCCException.Oh($"获取会员耗卡记录失败: {ex.Message}");
}
}
#endregion
|
96009bc9
hexiaodong
hxd
|
967
968
|
}
}
|