00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1
2
3
4
5
6
7
8
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using NCC.ClayObject;
using NCC.Common.Configuration;
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
9
|
using NCC.Common.Core.Manager;
|
96009bc9
hexiaodong
hxd
|
10
11
12
|
using NCC.Common.Enum;
using NCC.Common.Extension;
using NCC.Common.Filter;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
13
14
15
|
using NCC.Common.Helper;
using NCC.Common.Model.NPOI;
using NCC.DataEncryption;
|
96009bc9
hexiaodong
hxd
|
16
17
|
using NCC.Dependency;
using NCC.DynamicApiController;
|
96009bc9
hexiaodong
hxd
|
18
|
using NCC.Extend.Entitys.Dto.LqHytkHytk;
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
19
20
|
using NCC.Extend.Entitys.Dto.LqHytkJksyj;
using NCC.Extend.Entitys.Dto.LqHytkKjbsyj;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
21
|
using NCC.Extend.Entitys.Dto.LqHytkMx;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
22
|
using NCC.Extend.Entitys.Enum;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
23
24
25
26
|
using NCC.Extend.Entitys.lq_hytk_hytk;
using NCC.Extend.Entitys.lq_hytk_jksyj;
using NCC.Extend.Entitys.lq_hytk_kjbsyj;
using NCC.Extend.Entitys.lq_hytk_mx;
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
27
|
using NCC.Extend.Entitys.lq_kd_pxmx;
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
28
|
using NCC.Extend.Entitys.lq_xmzl;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
29
30
|
using NCC.Extend.Interfaces.LqHytkHytk;
using NCC.FriendlyException;
|
96009bc9
hexiaodong
hxd
|
31
|
using NCC.JsonSerialization;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
32
33
|
using SqlSugar;
using Yitter.IdGenerator;
|
96009bc9
hexiaodong
hxd
|
34
35
36
37
|
namespace NCC.Extend.LqHytkHytk
{
/// <summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
38
|
/// 退卡_信息表服务
|
96009bc9
hexiaodong
hxd
|
39
|
/// </summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
40
|
[ApiDescriptionSettings(Tag = "绿纤退卡信息表服务", Name = "LqHytkHytk", Order = 200)]
|
96009bc9
hexiaodong
hxd
|
41
42
43
44
45
|
[Route("api/Extend/[controller]")]
public class LqHytkHytkService : ILqHytkHytkService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<LqHytkHytkEntity> _lqHytkHytkRepository;
private readonly ISqlSugarRepository<LqHytkMxEntity> _lqHytkMxRepository;
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
46
47
|
private readonly ISqlSugarRepository<LqHytkJksyjEntity> _lqHytkJksyjRepository;
private readonly ISqlSugarRepository<LqHytkKjbsyjEntity> _lqHytkKjbsyjRepository;
|
96009bc9
hexiaodong
hxd
|
48
49
50
51
52
53
54
55
56
|
private readonly SqlSugarScope _db;
private readonly IUserManager _userManager;
/// <summary>
/// 初始化一个<see cref="LqHytkHytkService"/>类型的新实例
/// </summary>
public LqHytkHytkService(
ISqlSugarRepository<LqHytkHytkEntity> lqHytkHytkRepository,
ISqlSugarRepository<LqHytkMxEntity> lqHytkMxRepository,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
57
58
|
ISqlSugarRepository<LqHytkJksyjEntity> lqHytkJksyjRepository,
ISqlSugarRepository<LqHytkKjbsyjEntity> lqHytkKjbsyjRepository,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
59
60
|
IUserManager userManager
)
|
96009bc9
hexiaodong
hxd
|
61
|
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
62
|
_lqHytkHytkRepository = lqHytkHytkRepository;
|
96009bc9
hexiaodong
hxd
|
63
|
_lqHytkMxRepository = lqHytkMxRepository;
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
64
65
66
|
_lqHytkJksyjRepository = lqHytkJksyjRepository;
_lqHytkKjbsyjRepository = lqHytkKjbsyjRepository;
_db = _lqHytkHytkRepository.Context;
|
96009bc9
hexiaodong
hxd
|
67
68
69
|
_userManager = userManager;
}
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
70
|
#region 获取退卡信息列表
|
96009bc9
hexiaodong
hxd
|
71
|
/// <summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
72
|
/// 获取退卡信息列表
|
96009bc9
hexiaodong
hxd
|
73
|
/// </summary>
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
/// <remarks>
/// 获取退卡记录列表,支持根据健康师ID或科技部老师ID筛选,返回品项明细、健康师业绩和科技部老师业绩
///
/// 示例请求:
/// ```json
/// GET /api/Extend/LqHytkHytk?jksId=健康师ID&kjblsId=科技部老师ID&currentPage=1&pageSize=10
/// ```
///
/// 参数说明:
/// - jksId: 健康师ID(可选,传入后只返回该健康师参与的退卡记录)
/// - kjblsId: 科技部老师ID(可选,传入后只返回该老师参与的退卡记录)
/// - id: 退卡编号(可选)
/// - md: 门店ID(可选)
/// - hy: 会员ID(可选)
/// - tksj: 退卡时间(可选,格式:yyyy-MM-dd,yyyy-MM-dd)
/// - currentPage: 当前页码(必填)
/// - pageSize: 每页数量(必填)
///
/// 返回数据说明:
/// - 退卡基本信息:id、门店信息、会员信息、退卡金额、退卡时间等
/// - lqHytkMxList: 退卡品项明细列表,每个明细包含品项信息、退款金额、项目次数等
/// - lqHytkJksyjList: 健康师业绩列表,每个业绩包含健康师信息、业绩金额、手工费、退卡品项次数等
/// - lqHytkKjbsyjList: 科技部老师业绩列表,每个业绩包含科技部老师信息、业绩金额、手工费、退卡品项次数等
/// </remarks>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
98
|
/// <param name="input">查询参数</param>
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
99
100
101
102
|
/// <returns>分页的退卡记录列表,包含退卡基本信息、品项明细、健康师业绩、科技部老师业绩</returns>
/// <response code="200">成功返回退卡列表</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
103
104
105
106
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqHytkHytkListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
107
|
List<string> queryTksj = input.tksj != null ? input.tksj.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
108
109
|
DateTime? startTksj = queryTksj != null ? Ext.GetDateTime(queryTksj.First()) : null;
DateTime? endTksj = queryTksj != null ? Ext.GetDateTime(queryTksj.Last()) : null;
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
// 根据是否传入健康师ID或科技部老师ID,动态构建查询
ISugarQueryable<LqHytkHytkEntity> baseQuery = null;
if (!string.IsNullOrEmpty(input.jksId) && !string.IsNullOrEmpty(input.kjblsId))
{
// 同时传入健康师ID和科技部老师ID,需要同时关联两个业绩表(不过滤有效性)
baseQuery = _db.Queryable<LqHytkJksyjEntity, LqHytkKjbsyjEntity, LqHytkHytkEntity>(
(jksyj, kjbsyj, hytk) => jksyj.Gltkbh == hytk.Id && kjbsyj.Gltkbh == hytk.Id)
.Where((jksyj, kjbsyj, hytk) => jksyj.Jkszh == input.jksId)
.Where((jksyj, kjbsyj, hytk) => kjbsyj.Kjblszh == input.kjblsId)
.Select((jksyj, kjbsyj, hytk) => hytk)
.Distinct()
.MergeTable();
}
else if (!string.IsNullOrEmpty(input.jksId))
{
// 只传入健康师ID,关联健康师业绩表(不过滤有效性)
baseQuery = _db.Queryable<LqHytkJksyjEntity, LqHytkHytkEntity>(
(jksyj, hytk) => jksyj.Gltkbh == hytk.Id)
.Where((jksyj, hytk) => jksyj.Jkszh == input.jksId)
.Select((jksyj, hytk) => hytk)
.Distinct()
.MergeTable();
}
else if (!string.IsNullOrEmpty(input.kjblsId))
{
// 只传入科技部老师ID,关联科技部老师业绩表(不过滤有效性)
baseQuery = _db.Queryable<LqHytkKjbsyjEntity, LqHytkHytkEntity>(
(kjbsyj, hytk) => kjbsyj.Gltkbh == hytk.Id)
.Where((kjbsyj, hytk) => kjbsyj.Kjblszh == input.kjblsId)
.Select((kjbsyj, hytk) => hytk)
.Distinct()
.MergeTable();
}
else
{
// 没有传入健康师ID或科技部老师ID,使用原来的查询逻辑
baseQuery = _db.Queryable<LqHytkHytkEntity>();
}
var data = await baseQuery
|
96009bc9
hexiaodong
hxd
|
152
153
|
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
154
|
.WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
|
96009bc9
hexiaodong
hxd
|
155
156
|
.WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
.WhereIF(!string.IsNullOrEmpty(input.hy), p => p.Hy.Equals(input.hy))
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
157
|
.WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
|
96009bc9
hexiaodong
hxd
|
158
|
.WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
159
160
161
|
.WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Contains(input.gklx))
.WhereIF(input.tkje.HasValue, p => p.Tkje == input.tkje)
.WhereIF(input.sgfy.HasValue, p => p.Sgfy == input.sgfy)
|
96009bc9
hexiaodong
hxd
|
162
|
.WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
163
164
|
.WhereIF(!string.IsNullOrEmpty(input.tkzt), p => p.Tkzt.Contains(input.tkzt))
.WhereIF(!string.IsNullOrEmpty(input.tkyy), p => p.Tkyy.Contains(input.tkyy))
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
165
|
.WhereIF(!string.IsNullOrEmpty(input.fileUrl), p => p.FileUrl.Contains(input.fileUrl))
|
fee50345
“wangming”
feat: 实现KPI数据穿透功能
|
166
167
|
.WhereIF(startTksj.HasValue, p => p.Tksj >= new DateTime(startTksj.Value.Year, startTksj.Value.Month, startTksj.Value.Day, 0, 0, 0))
.WhereIF(endTksj.HasValue, p => p.Tksj <= new DateTime(endTksj.Value.Year, endTksj.Value.Month, endTksj.Value.Day, 23, 59, 59))
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
168
|
.WhereIF(!string.IsNullOrEmpty(input.czry), p => p.Czry.Equals(input.czry))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
169
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
5e0c6e5a
“wangming”
feat: 完善会员画像功能,优化...
|
170
|
.WhereIF(input.isEffective == 0, p => p.IsEffective == StatusEnum.有效.GetHashCode()) // 如果未指定,默认只返回有效的
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
171
|
.Select(it => new LqHytkHytkListOutput
|
96009bc9
hexiaodong
hxd
|
172
173
|
{
id = it.Id,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
md = it.Md,
mdbh = it.Mdbh,
mdmc = it.Mdmc,
hy = it.Hy,
hymc = it.Hymc,
hyzh = it.Hyzh,
gklx = it.Gklx,
tkje = it.Tkje,
sgfy = it.Sgfy,
bz = it.Bz,
tkzt = it.Tkzt,
tkyy = it.Tkyy,
tksj = it.Tksj,
czry = it.Czry,
fileUrl = it.FileUrl,
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
189
|
isEffective = it.IsEffective,
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
190
|
cancelRemark = it.CancelRemark,
|
63df7ccb
“wangming”
1
|
191
|
actualRefundAmount = it.ActualRefundAmount
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
192
193
194
195
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
a78c0ae8
“wangming”
feat: 退卡服务添加健康师和科...
|
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
|
// 获取当前页的退卡记录ID列表
var refundIds = data.list.Select(x => x.id).ToList();
// 批量查询品项明细(不过滤有效性,返回所有记录)
var itemDetails = new List<LqHytkMxInfoOutput>();
if (refundIds.Any())
{
itemDetails = await _db.Queryable<LqHytkMxEntity>()
.Where(x => refundIds.Contains(x.RefundInfoId))
.Select(x => new LqHytkMxInfoOutput
{
id = x.Id,
refundInfoId = x.RefundInfoId,
billingItemId = x.BillingItemId,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
tkje = x.Tkje,
projectNumber = x.ProjectNumber,
isEffective = x.IsEffective,
sourceType = x.SourceType,
totalPrice = x.TotalPrice
})
.ToListAsync();
}
// 批量查询健康师业绩(性能优化:一次性查询所有退卡的健康师业绩,不过滤有效性)
var jksyjList = new List<LqHytkJksyjInfoOutput>();
if (refundIds.Any())
{
jksyjList = await _db.Queryable<LqHytkJksyjEntity>()
.Where(x => refundIds.Contains(x.Gltkbh))
.Select(x => new LqHytkJksyjInfoOutput
{
id = x.Id,
gltkbh = x.Gltkbh,
jks = x.Jks,
jksxm = x.Jksxm,
jkszh = x.Jkszh,
jksyj = x.Jksyj,
tksj = x.Tksj,
F_jsjid = x.F_jsjid,
F_tkpxid = x.F_tkpxid,
F_LaborCost = x.F_LaborCost,
F_tkpxNumber = x.F_tkpxNumber
})
.ToListAsync();
}
// 批量查询科技部老师业绩(性能优化:一次性查询所有退卡的科技部老师业绩,不过滤有效性)
var kjbsyjList = new List<LqHytkKjbsyjInfoOutput>();
if (refundIds.Any())
{
kjbsyjList = await _db.Queryable<LqHytkKjbsyjEntity>()
.Where(x => refundIds.Contains(x.Gltkbh))
.Select(x => new LqHytkKjbsyjInfoOutput
{
id = x.Id,
gltkbh = x.Gltkbh,
kjbls = x.Kjbls,
kjblsxm = x.Kjblsxm,
kjblszh = x.Kjblszh,
kjblsyj = x.Kjblsyj,
tksj = x.Tksj,
F_tkpxid = x.F_tkpxid,
F_LaborCost = x.F_LaborCost,
F_tkpxNumber = x.F_tkpxNumber
})
.ToListAsync();
}
// 按退卡ID分组品项明细
var itemDetailsGrouped = itemDetails.GroupBy(x => x.refundInfoId)
.ToDictionary(g => g.Key, g => g.ToList());
// 按退卡ID分组健康师业绩
var jksyjGrouped = jksyjList.GroupBy(x => x.gltkbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 按退卡ID分组科技部老师业绩
var kjbsyjGrouped = kjbsyjList.GroupBy(x => x.gltkbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个退卡记录分配品项明细、健康师业绩和科技部老师业绩
foreach (var item in data.list)
{
item.lqHytkMxList = itemDetailsGrouped.ContainsKey(item.id)
? itemDetailsGrouped[item.id]
: new List<LqHytkMxInfoOutput>();
item.lqHytkJksyjList = jksyjGrouped.ContainsKey(item.id)
? jksyjGrouped[item.id]
: new List<LqHytkJksyjInfoOutput>();
item.lqHytkKjbsyjList = kjbsyjGrouped.ContainsKey(item.id)
? kjbsyjGrouped[item.id]
: new List<LqHytkKjbsyjInfoOutput>();
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
294
|
return PageResult<LqHytkHytkListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
295
|
}
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
296
|
#endregion
|
96009bc9
hexiaodong
hxd
|
297
|
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
298
|
#region 创建退卡信息及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
96009bc9
hexiaodong
hxd
|
299
|
/// <summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
300
|
/// 创建退卡信息及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
96009bc9
hexiaodong
hxd
|
301
|
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
302
|
/// <remarks>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
303
304
305
306
307
308
309
310
311
312
|
/// 参数说明:
/// - md: 门店ID
/// - hy: 会员ID
/// - lqHytkMxList: 退卡品项明细列表
/// </remarks>
/// <param name="input">退卡创建参数</param>
/// <returns>无返回值</returns>
/// <response code="200">创建成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
313
314
315
316
317
318
|
[HttpPost("")]
public async Task Create([FromBody] LqHytkHytkCrInput input)
{
var userInfo = await _userManager.GetUserInfo();
var entity = input.Adapt<LqHytkHytkEntity>();
entity.Id = YitIdHelper.NextId().ToString();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
319
320
|
entity.F_CreateTime = DateTime.Now;
entity.F_CreateUser = userInfo.userId;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
321
|
entity.IsEffective = StatusEnum.有效.GetHashCode();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
322
|
entity.Czry = userInfo.userId;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
323
|
|
96009bc9
hexiaodong
hxd
|
324
325
|
try
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
326
|
// 开启事务
|
96009bc9
hexiaodong
hxd
|
327
|
_db.BeginTran();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
328
|
// 新增退卡主表记录
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
329
|
var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
330
331
332
333
|
// 收集所有需要插入的实体,然后批量插入
var allMxEntities = new List<LqHytkMxEntity>();
var allJksyjEntities = new List<LqHytkJksyjEntity>();
var allKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
334
335
|
// 处理品项明细列表
if (input.lqHytkMxList != null && input.lqHytkMxList.Any())
|
96009bc9
hexiaodong
hxd
|
336
|
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
337
|
foreach (var item in input.lqHytkMxList)
|
96009bc9
hexiaodong
hxd
|
338
|
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
339
340
341
342
|
// 创建品项明细实体
var lqHytkMxEntity = new LqHytkMxEntity
{
Id = YitIdHelper.NextId().ToString(),
|
b45d55f7
“wangming”
Refactor LqEventS...
|
343
344
|
RefundInfoId = newEntity.Id,
BillingItemId = item.billingItemId,
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
345
|
MemberId = newEntity.Hy,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
346
347
|
CreateTime = DateTime.Now,
CreateUser = userInfo.userId,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
348
349
350
351
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
Tkje = item.tkje,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
352
|
Tksj = input.tksj,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
353
|
ProjectNumber = item.F_ProjectNumber ?? 1,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
354
355
|
SourceType = item.F_SourceType,
TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
356
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
357
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
358
|
PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
359
|
BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.BeautyType).FirstAsync(),
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
360
361
|
};
allMxEntities.Add(lqHytkMxEntity);
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
362
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
363
364
365
366
367
|
// 收集该品项关联的健康师业绩
if (item.lqHytkJksyjList != null && item.lqHytkJksyjList.Any())
{
foreach (var ijks_tem in item.lqHytkJksyjList)
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
368
369
370
371
372
373
374
375
|
allJksyjEntities.Add(new LqHytkJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Gltkbh = newEntity.Id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
376
|
Tksj = input.tksj,
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
377
378
379
380
381
382
|
F_jsjid = ijks_tem.F_jsjid,
F_tkpxid = ijks_tem.F_tkpxid,
F_LaborCost = ijks_tem.F_LaborCost,
F_tkpxNumber = ijks_tem.F_tkpxNumber,
F_CreateTime = DateTime.Now,
F_CreateUser = userInfo.userId,
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
383
384
|
CardReturn = lqHytkMxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
385
386
|
ItemCategory = lqHytkMxEntity.ItemCategory,
ItemId = lqHytkMxEntity.Px,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
387
|
StoreId = newEntity.Md,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
388
|
ItemName = lqHytkMxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
389
390
|
PerformanceType = lqHytkMxEntity.PerformanceType,
BeautyType = lqHytkMxEntity.BeautyType,
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
391
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
392
|
);
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
393
394
|
}
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
395
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
396
397
398
399
400
|
// 收集该品项关联的科技部老师业绩
if (item.lqHytkKjbsyjList != null && item.lqHytkKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqHytkKjbsyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
401
402
403
404
405
406
407
408
409
|
allKjbsyjEntities.Add(
new LqHytkKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Gltkbh = newEntity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
410
|
Tksj = input.tksj,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
411
412
413
414
415
|
F_tkpxid = ikjbs_tem.F_tkpxid,
F_LaborCost = ikjbs_tem.F_LaborCost,
F_tkpxNumber = ikjbs_tem.F_tkpxNumber,
F_CreateTime = DateTime.Now,
F_CreateUser = userInfo.userId,
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
416
|
CardReturn = lqHytkMxEntity.Id,
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
417
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
418
419
|
ItemCategory = lqHytkMxEntity.ItemCategory,
ItemId = lqHytkMxEntity.Px,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
420
|
StoreId = newEntity.Md,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
421
|
ItemName = lqHytkMxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
422
423
|
PerformanceType = lqHytkMxEntity.PerformanceType,
BeautyType = lqHytkMxEntity.BeautyType,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
424
425
|
}
);
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
426
427
|
}
}
|
96009bc9
hexiaodong
hxd
|
428
|
}
|
96009bc9
hexiaodong
hxd
|
429
|
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
430
431
|
// 批量插入品项明细
if (allMxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
432
|
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
433
|
await _db.Insertable(allMxEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
434
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
435
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
436
437
|
// 批量插入健康师业绩
if (allJksyjEntities.Any())
|
96009bc9
hexiaodong
hxd
|
438
|
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
439
|
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
440
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
441
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
442
443
|
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
|
96009bc9
hexiaodong
hxd
|
444
|
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
445
|
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
446
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
447
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
448
449
450
451
452
453
454
|
// 关闭事务
_db.CommitTran();
}
catch (Exception ex)
{
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1005, ex.Message);
|
96009bc9
hexiaodong
hxd
|
455
456
|
}
}
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
457
|
#endregion
|
96009bc9
hexiaodong
hxd
|
458
|
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
459
|
#region 更新退卡信息及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
96009bc9
hexiaodong
hxd
|
460
|
/// <summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
461
|
/// 更新退卡信息及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
96009bc9
hexiaodong
hxd
|
462
|
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
463
464
465
466
467
468
469
470
471
472
|
/// <remarks>
/// 更新退卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 先删除原有的关联数据,再插入新的数据
/// </remarks>
/// <param name="id">退卡ID</param>
/// <param name="input">退卡更新参数</param>
/// <returns>无返回值</returns>
/// <response code="200">更新成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
473
474
475
|
[HttpPut("{id}")]
public async Task Update(string id, [FromBody] LqHytkHytkUpInput input)
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
476
|
var userInfo = await _userManager.GetUserInfo();
|
96009bc9
hexiaodong
hxd
|
477
|
var entity = input.Adapt<LqHytkHytkEntity>();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
478
479
480
|
entity.Id = id;
entity.F_ModifyTime = DateTime.Now;
entity.F_ModifyUser = userInfo.userId;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
481
|
|
96009bc9
hexiaodong
hxd
|
482
483
|
try
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
484
|
// 开启事务
|
96009bc9
hexiaodong
hxd
|
485
|
_db.BeginTran();
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
486
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
487
488
|
// 更新退卡主表记录
await _db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync();
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
489
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
490
|
// 删除原有的关联数据
|
b45d55f7
“wangming”
Refactor LqEventS...
|
491
|
await _db.Deleteable<LqHytkMxEntity>().Where(x => x.RefundInfoId == id).ExecuteCommandAsync();
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
492
493
|
await _db.Deleteable<LqHytkJksyjEntity>().Where(x => x.Gltkbh == id).ExecuteCommandAsync();
await _db.Deleteable<LqHytkKjbsyjEntity>().Where(x => x.Gltkbh == id).ExecuteCommandAsync();
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
494
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
495
496
497
498
|
// 收集所有需要插入的实体,然后批量插入
var allMxEntities = new List<LqHytkMxEntity>();
var allJksyjEntities = new List<LqHytkJksyjEntity>();
var allKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
499
500
|
// 处理品项明细列表
if (input.lqHytkMxList != null && input.lqHytkMxList.Any())
|
96009bc9
hexiaodong
hxd
|
501
|
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
502
|
foreach (var item in input.lqHytkMxList)
|
96009bc9
hexiaodong
hxd
|
503
|
{
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
504
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
505
506
507
508
|
// 创建品项明细实体
var lqHytkMxEntity = new LqHytkMxEntity
{
Id = YitIdHelper.NextId().ToString(),
|
b45d55f7
“wangming”
Refactor LqEventS...
|
509
510
|
RefundInfoId = id,
BillingItemId = item.billingItemId,
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
511
|
MemberId = entity.Hy,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
512
513
|
CreateTime = DateTime.Now,
CreateUser = userInfo.userId,
|
dac8767e
“wangming”
111111111
|
514
|
Tksj = input.tksj,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
515
516
517
518
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
Tkje = item.tkje,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
519
|
ProjectNumber = item.F_ProjectNumber ?? 1,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
520
521
|
SourceType = item.F_SourceType,
TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)),
|
14cbcfd9
“wangming”
feat: 添加人次记录表和品项分类字段
|
522
|
ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
523
|
PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
524
|
BeautyType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.BeautyType).FirstAsync(),
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
525
526
|
};
allMxEntities.Add(lqHytkMxEntity);
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
527
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
528
529
530
531
532
|
// 收集该品项关联的健康师业绩
if (item.lqHytkJksyjList != null && item.lqHytkJksyjList.Any())
{
foreach (var ijks_tem in item.lqHytkJksyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
533
534
535
536
537
538
539
540
541
|
allJksyjEntities.Add(
new LqHytkJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Gltkbh = id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
542
|
Tksj = input.tksj,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
543
544
545
546
547
548
|
F_jsjid = ijks_tem.F_jsjid,
F_tkpxid = ijks_tem.F_tkpxid,
F_LaborCost = ijks_tem.F_LaborCost,
F_tkpxNumber = ijks_tem.F_tkpxNumber,
F_CreateTime = DateTime.Now,
F_CreateUser = userInfo.userId,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
549
550
|
ItemCategory = lqHytkMxEntity.ItemCategory,
ItemId = lqHytkMxEntity.Px,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
551
|
StoreId = entity.Md,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
552
|
ItemName = lqHytkMxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
553
554
|
PerformanceType = lqHytkMxEntity.PerformanceType,
BeautyType = lqHytkMxEntity.BeautyType,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
555
556
|
}
);
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
557
558
|
}
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
559
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
560
561
562
563
564
|
// 收集该品项关联的科技部老师业绩
if (item.lqHytkKjbsyjList != null && item.lqHytkKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqHytkKjbsyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
565
566
567
568
569
570
571
572
573
|
allKjbsyjEntities.Add(
new LqHytkKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Gltkbh = id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
|
96e0ccc7
“wangming”
优化GetBillingRecor...
|
574
|
Tksj = input.tksj,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
575
576
577
578
579
|
F_tkpxid = ikjbs_tem.F_tkpxid,
F_LaborCost = ikjbs_tem.F_LaborCost,
F_tkpxNumber = ikjbs_tem.F_tkpxNumber,
F_CreateTime = DateTime.Now,
F_CreateUser = userInfo.userId,
|
8514f465
“wangming”
feat: 优化业务逻辑和功能完善
|
580
581
|
ItemCategory = lqHytkMxEntity.ItemCategory,
ItemId = lqHytkMxEntity.Px,
|
7e362a14
“wangming”
feat: 为业绩表添加门店ID和...
|
582
|
StoreId = entity.Md,
|
3f8b942f
“wangming”
feat: 添加业绩类型字段并修复...
|
583
|
ItemName = lqHytkMxEntity.Pxmc,
|
ac25ff12
“wangming”
feat: 添加大项目部老师工资计...
|
584
585
|
PerformanceType = lqHytkMxEntity.PerformanceType,
BeautyType = lqHytkMxEntity.BeautyType,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
586
587
|
}
);
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
588
589
|
}
}
|
96009bc9
hexiaodong
hxd
|
590
|
}
|
96009bc9
hexiaodong
hxd
|
591
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
592
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
593
594
595
596
597
|
// 批量插入品项明细
if (allMxEntities.Any())
{
await _db.Insertable(allMxEntities).ExecuteCommandAsync();
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
598
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
599
600
601
602
603
|
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
604
605
606
607
608
|
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
609
|
// 关闭事务
|
96009bc9
hexiaodong
hxd
|
610
611
|
_db.CommitTran();
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
612
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
613
|
{
|
96009bc9
hexiaodong
hxd
|
614
|
_db.RollbackTran();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
615
|
throw NCCException.Oh(ErrorCode.COM1005, ex.Message);
|
96009bc9
hexiaodong
hxd
|
616
617
|
}
}
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
618
|
#endregion
|
96009bc9
hexiaodong
hxd
|
619
|
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
620
|
#region 作废退卡信息
|
96009bc9
hexiaodong
hxd
|
621
|
/// <summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
622
|
/// 作废退卡信息
|
96009bc9
hexiaodong
hxd
|
623
|
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
624
|
/// <param name="id">主键</param>
|
96009bc9
hexiaodong
hxd
|
625
|
/// <returns></returns>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
626
|
[HttpPut("VoidRefundCardInfo/{id}")]
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
627
|
public async Task<dynamic> VoidRefundCardInfo(string id, [FromQuery] string remarks = null)
|
96009bc9
hexiaodong
hxd
|
628
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
629
|
try
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
630
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
631
632
633
634
635
636
637
638
|
var entity = await _db.Queryable<LqHytkHytkEntity>().FirstAsync(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode());
if (entity == null)
{
throw NCCException.Oh("退卡信息不存在或已被作废");
}
// 开启事务
_db.BeginTran();
// 更新主表
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
639
|
entity.IsEffective = StatusEnum.无效.GetHashCode();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
640
|
entity.F_ModifyTime = DateTime.Now;
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
641
|
entity.CancelRemark = remarks;
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
642
643
|
await _db.Updateable(entity).ExecuteCommandAsync();
// 更新明细表
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
644
|
await _db.Updateable<LqHytkMxEntity>().SetColumns(it => new LqHytkMxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.RefundInfoId == id).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
645
|
// 更新健康师业绩表
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
646
|
await _db.Updateable<LqHytkJksyjEntity>().SetColumns(it => new LqHytkJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Gltkbh == id).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
647
|
// 更新科技部业绩表
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
648
|
await _db.Updateable<LqHytkKjbsyjEntity>().SetColumns(it => new LqHytkKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Gltkbh == id).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
649
650
651
652
653
654
655
656
|
// 提交事务
_db.CommitTran();
return entity;
}
catch (Exception ex)
{
_db.RollbackTran();
throw NCCException.Oh($"删除退卡信息失败: {ex.Message}");
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
657
658
|
}
}
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
659
|
#endregion
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
660
|
|
dac8767e
“wangming”
111111111
|
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
|
#region 物理删除退卡信息
/// <summary>
/// 物理删除退卡信息
/// </summary>
/// <remarks>
/// 彻底删除退卡记录及其所有关联数据,包括:
/// - 退卡主表记录
/// - 退卡品项明细记录
/// - 退卡健康师业绩记录
/// - 退卡科技部老师业绩记录
///
/// 注意:此操作不可逆,请谨慎使用
/// </remarks>
/// <param name="id">退卡记录主键ID</param>
/// <returns>删除结果</returns>
/// <response code="200">删除成功</response>
/// <response code="404">退卡记录不存在</response>
/// <response code="500">服务器内部错误</response>
[HttpDelete("physical/{id}")]
public async Task<dynamic> PhysicalDelete(string id)
{
try
{
// 检查退卡记录是否存在
var entity = await _db.Queryable<LqHytkHytkEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh("退卡记录不存在");
}
// 开启事务
_db.BeginTran();
// 1. 删除退卡品项明细记录
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
695
|
await _db.Deleteable<LqHytkMxEntity>().Where(x => x.RefundInfoId == id).ExecuteCommandAsync();
|
dac8767e
“wangming”
111111111
|
696
697
|
// 2. 删除退卡健康师业绩记录
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
698
|
await _db.Deleteable<LqHytkJksyjEntity>().Where(x => x.Gltkbh == id).ExecuteCommandAsync();
|
dac8767e
“wangming”
111111111
|
699
700
|
// 3. 删除退卡科技部老师业绩记录
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
701
|
await _db.Deleteable<LqHytkKjbsyjEntity>().Where(x => x.Gltkbh == id).ExecuteCommandAsync();
|
dac8767e
“wangming”
111111111
|
702
703
|
// 4. 删除退卡主表记录
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
704
|
await _db.Deleteable<LqHytkHytkEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
|
dac8767e
“wangming”
111111111
|
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
|
// 提交事务
_db.CommitTran();
return new
{
success = true,
message = "退卡记录已彻底删除",
deletedId = id,
deletedTime = DateTime.Now
};
}
catch (Exception ex)
{
// 回滚事务
_db.RollbackTran();
throw NCCException.Oh($"物理删除退卡记录失败: {ex.Message}");
}
}
#endregion
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
726
|
#region 获取退卡信息详情
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
727
728
729
730
731
732
|
/// <summary>
/// 获取退卡信息详情
/// </summary>
/// <remarks>
/// 获取退卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 按照退卡的完整格式返回数据,不包含汇总信息
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
733
|
///
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
734
735
736
737
738
739
740
741
742
743
744
745
746
747
|
/// 返回数据结构:
/// - 主表信息:退卡基础信息、门店信息、会员信息、退卡金额等
/// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
/// - 健康师业绩列表:按品项关联的健康师业绩信息
/// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
/// </remarks>
/// <param name="id">退卡记录主键ID</param>
/// <returns>退卡记录完整信息</returns>
/// <response code="200">查询成功</response>
/// <response code="404">退卡记录不存在</response>
/// <response code="500">服务器内部错误</response>
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
|
96009bc9
hexiaodong
hxd
|
748
749
|
try
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
750
|
// 1. 查询主表信息
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
751
|
var entity = await _db.Queryable<LqHytkHytkEntity>().Where(p => p.Id == id).FirstAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
752
753
|
if (entity == null)
{
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
754
|
throw NCCException.Oh("退卡记录不存在");
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
755
|
}
|
96009bc9
hexiaodong
hxd
|
756
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
757
758
759
|
var output = entity.Adapt<LqHytkHytkInfoOutput>();
// 2. 查询品项明细列表
|
b45d55f7
“wangming”
Refactor LqEventS...
|
760
|
var lqHytkMxList = await _db.Queryable<LqHytkMxEntity>().Where(w => w.RefundInfoId == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
761
762
|
// 3. 查询健康师业绩列表
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
763
|
var lqHytkJksyjList = await _db.Queryable<LqHytkJksyjEntity>().Where(w => w.Gltkbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
764
765
|
// 4. 查询科技部老师业绩列表
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
766
|
var lqHytkKjbsyjList = await _db.Queryable<LqHytkKjbsyjEntity>().Where(w => w.Gltkbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
767
768
769
770
771
772
773
774
|
// 5. 构建品项明细输出,每个品项关联对应的业绩信息
var mxOutputList = new List<LqHytkMxInfoOutput>();
foreach (var mx in lqHytkMxList)
{
var mxOutput = new LqHytkMxInfoOutput
{
id = mx.Id,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
775
776
|
refundInfoId = mx.RefundInfoId,
billingItemId = mx.BillingItemId,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
777
778
779
780
|
px = mx.Px,
pxmc = mx.Pxmc,
pxjg = mx.Pxjg,
tkje = mx.Tkje,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
781
|
projectNumber = mx.ProjectNumber,
|
b45d55f7
“wangming”
Refactor LqEventS...
|
782
783
|
sourceType = mx.SourceType,
totalPrice = mx.TotalPrice,
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
784
|
isEffective = mx.IsEffective,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
785
786
787
|
};
// 关联该品项的健康师业绩
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
788
|
var jksyjForMx = lqHytkJksyjList.Where(j => j.CardReturn == mx.Id).ToList();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
789
790
791
|
mxOutput.lqHytkJksyjList = jksyjForMx.Adapt<List<LqHytkJksyjInfoOutput>>();
// 关联该品项的科技部老师业绩
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
792
|
var kjbsyjForMx = lqHytkKjbsyjList.Where(k => k.CardReturn == mx.Id).ToList();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
793
794
795
796
797
798
799
800
801
802
803
804
805
|
mxOutput.lqHytkKjbsyjList = kjbsyjForMx.Adapt<List<LqHytkKjbsyjInfoOutput>>();
mxOutputList.Add(mxOutput);
}
// 6. 设置输出结果
output.lqHytkMxList = mxOutputList;
// 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
output.lqHytkJksyjList = lqHytkJksyjList.Adapt<List<LqHytkJksyjInfoOutput>>();
output.lqHytkKjbsyjList = lqHytkKjbsyjList.Adapt<List<LqHytkKjbsyjInfoOutput>>();
return output;
|
96009bc9
hexiaodong
hxd
|
806
|
}
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
807
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
808
|
{
|
fb9d5c60
“wangming”
feat: 更新LqHytkHyt...
|
809
|
throw NCCException.Oh($"获取退卡记录详情失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
810
811
|
}
}
|
0ef47194
“wangming”
Refactor LqHytkHy...
|
812
|
#endregion
|
96009bc9
hexiaodong
hxd
|
813
814
|
}
}
|