00486d53
“wangming”
更新多个.DS_Store文件,优...
|
1
2
3
4
5
6
7
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
8
|
using Microsoft.Extensions.Logging;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
9
10
11
|
using NCC.ClayObject;
using NCC.Common.Configuration;
using NCC.Common.Core.Manager;
|
96009bc9
hexiaodong
hxd
|
12
13
14
|
using NCC.Common.Enum;
using NCC.Common.Extension;
using NCC.Common.Filter;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
15
16
17
|
using NCC.Common.Helper;
using NCC.Common.Model.NPOI;
using NCC.DataEncryption;
|
96009bc9
hexiaodong
hxd
|
18
19
|
using NCC.Dependency;
using NCC.DynamicApiController;
|
b45d55f7
“wangming”
Refactor LqEventS...
|
20
|
using NCC.Extend.Entitys.Dto.Common;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
21
|
using NCC.Extend.Entitys.Dto.LqKdDeductinfo;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
22
|
using NCC.Extend.Entitys.Dto.LqKdKdjlb;
|
b45d55f7
“wangming”
Refactor LqEventS...
|
23
|
using NCC.Extend.Entitys.Enum;
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
24
|
using NCC.Extend.Entitys.lq_hytk_hytk;
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
25
|
using NCC.Extend.Entitys.lq_hytk_mx;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
26
27
|
using NCC.Extend.Entitys.lq_hytk_jksyj;
using NCC.Extend.Entitys.lq_hytk_kjbsyj;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
28
|
using NCC.Extend.Entitys.lq_jinsanjiao_user;
|
b45d55f7
“wangming”
Refactor LqEventS...
|
29
|
using NCC.Extend.Entitys.lq_kd_deductinfo;
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
30
31
|
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_pxmx;
|
efde7d04
“wangming”
更新多个文件,删除不再使用的CSS...
|
32
|
using NCC.Extend.Entitys.lq_kd_jksyj;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
33
|
using NCC.Extend.Entitys.lq_kd_kdjlb;
|
efde7d04
“wangming”
更新多个文件,删除不再使用的CSS...
|
34
35
|
using NCC.Extend.Entitys.lq_kd_kjbsyj;
using NCC.Extend.Entitys.lq_kd_pxmx;
|
41da4257
“wangming”
Refactor LqEventS...
|
36
|
using NCC.Extend.Entitys.lq_khxx;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
37
38
|
using NCC.Extend.Entitys.lq_xmzl;
using NCC.Extend.Interfaces.LqKdKdjlb;
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
39
|
using NCC.Extend.Utils;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
40
41
|
using NCC.FriendlyException;
using NCC.JsonSerialization;
|
06553fb7
“wangming”
1
|
42
|
using NCC.System.Entitys.Permission;
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
43
44
|
using SqlSugar;
using Yitter.IdGenerator;
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
45
|
using NCC.Extend.Entitys.lq_package_info;
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
46
|
using NCC.Extend.Entitys.lq_mdxx;
|
5b462535
“wangming”
1111
|
47
|
using NCC.Extend.Entitys.lq_card_transfer_log;
|
96009bc9
hexiaodong
hxd
|
48
49
50
51
52
53
|
namespace NCC.Extend.LqKdKdjlb
{
/// <summary>
/// 开单记录表服务
/// </summary>
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
54
|
[ApiDescriptionSettings(Tag = "绿纤开单记录表服务", Name = "LqKdKdjlb", Order = 200)]
|
96009bc9
hexiaodong
hxd
|
55
56
57
58
59
60
61
62
63
|
[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...
|
64
65
|
private readonly WeChatBotService _weChatBotService;
private readonly LqKdKdjlbStringGenerator _stringGenerator;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
66
|
private readonly ILogger<LqKdKdjlbService> _logger;
|
96009bc9
hexiaodong
hxd
|
67
68
69
70
71
72
73
74
75
|
/// <summary>
/// 初始化一个<see cref="LqKdKdjlbService"/>类型的新实例
/// </summary>
public LqKdKdjlbService(
ISqlSugarRepository<LqKdKdjlbEntity> lqKdKdjlbRepository,
ISqlSugarRepository<LqKdJksyjEntity> lqKdJksyjRepository,
ISqlSugarRepository<LqKdKjbsyjEntity> lqKdKjbsyjRepository,
ISqlSugarRepository<LqKdPxmxEntity> lqKdPxmxRepository,
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
76
77
|
IUserManager userManager,
WeChatBotService weChatBotService,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
78
79
|
LqKdKdjlbStringGenerator stringGenerator,
ILogger<LqKdKdjlbService> logger
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
80
|
)
|
96009bc9
hexiaodong
hxd
|
81
|
{
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
82
|
_lqKdKdjlbRepository = lqKdKdjlbRepository;
|
96009bc9
hexiaodong
hxd
|
83
84
85
86
87
|
_db = _lqKdKdjlbRepository.Context;
_lqKdJksyjRepository = lqKdJksyjRepository;
_lqKdKjbsyjRepository = lqKdKjbsyjRepository;
_lqKdPxmxRepository = lqKdPxmxRepository;
_userManager = userManager;
|
bdf9e891
“wangming”
更新.gitignore以包含.z...
|
88
89
|
_weChatBotService = weChatBotService;
_stringGenerator = stringGenerator;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
90
|
_logger = logger;
|
96009bc9
hexiaodong
hxd
|
91
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
92
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
93
|
#region 获取开单记录表
|
96009bc9
hexiaodong
hxd
|
94
95
96
|
/// <summary>
/// 获取开单记录表
/// </summary>
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
97
98
99
|
/// <remarks>
/// 获取开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
/// 按照开单的完整格式返回数据,不包含汇总信息
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
100
|
///
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
101
102
103
104
105
106
107
108
109
110
111
|
/// 返回数据结构:
/// - 主表信息:开单基础信息、业绩信息、支付信息、会员信息等
/// - 品项明细列表:每个品项包含完整的项目信息(项目次数、是否有效、来源类型等)
/// - 健康师业绩列表:按品项关联的健康师业绩信息
/// - 科技部老师业绩列表:按品项关联的科技部老师业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <returns>开单记录完整信息</returns>
/// <response code="200">查询成功</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
112
113
114
|
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
115
116
117
118
119
120
121
122
|
try
{
// 1. 查询主表信息
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
if (entity == null)
{
throw NCCException.Oh(ErrorCode.COM1005, "开单记录不存在");
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
123
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
124
|
var output = entity.Adapt<LqKdKdjlbInfoOutput>();
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
125
126
127
128
|
if (output.activityId != null)
{
output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
}
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
129
130
131
132
|
//获取会员信息
var MemberInfo = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == entity.Kdhy);
output.kdhyc = MemberInfo.Khmc;
output.kdhysjh = MemberInfo.Sjh;
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
133
|
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
134
135
136
137
|
if (!string.IsNullOrEmpty(entity.ActivityId))
{
output.activityName = await _db.Queryable<LqPackageInfoEntity>().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync();
}
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
138
|
// 2. 查询品项明细列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
139
|
var lqKdPxmxList = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
140
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
141
|
// 3. 查询健康师业绩列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
142
|
var lqKdJksyjList = await _db.Queryable<LqKdJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
143
144
|
// 4. 查询科技部老师业绩列表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
145
|
var lqKdKjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
146
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
147
148
149
|
// 5. 查询扣款信息列表
var lqKdDeductList = await _db.Queryable<LqKdDeductinfoEntity>().Where(w => w.BillingId == entity.Id).ToListAsync();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
// 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文件,优...
|
166
|
totalPrice = pxmx.TotalPrice,
|
bff07b1f
“wangming”
Refactor FileVari...
|
167
|
actualPrice = pxmx.ActualPrice,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
168
|
remark = pxmx.Remark,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
169
|
isEffective = pxmx.IsEffective,
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
170
171
172
173
174
175
176
177
178
179
|
};
// 关联该品项的健康师业绩
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”
优化开单记录作废功能:添加详细错误...
|
180
|
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
181
182
183
184
185
186
187
188
189
|
pxmxOutputList.Add(pxmxOutput);
}
// 6. 设置输出结果
output.lqKdPxmxList = pxmxOutputList;
// 7. 设置全局业绩列表(用于兼容性,但主要使用品项关联的业绩)
output.lqKdJksyjList = lqKdJksyjList.Adapt<List<LqKdJksyjInfoOutput>>();
output.lqKdKjbsyjList = lqKdKjbsyjList.Adapt<List<LqKdKjbsyjInfoOutput>>();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
190
191
|
// 8. 设置扣款信息列表
output.lqKdDeductList = lqKdDeductList.Adapt<List<LqKdDeductinfoInfoOutput>>();
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
192
193
194
195
196
197
198
199
|
return output;
}
catch (Exception ex)
{
Console.WriteLine($"获取开单记录失败: {ex.Message}");
throw NCCException.Oh(ErrorCode.COM1000, "获取开单记录失败");
}
|
96009bc9
hexiaodong
hxd
|
200
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
201
|
#endregion
|
96009bc9
hexiaodong
hxd
|
202
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
203
|
#region 获取开单记录表列表
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
204
|
|
96009bc9
hexiaodong
hxd
|
205
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
206
207
208
209
|
/// 获取开单记录表列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
210
211
212
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqKdKdjlbListQueryInput input)
{
|
ed462a62
“wangming”
更新开发环境配置和优化客户信息导入功能
|
213
|
var sidx = input.sidx == null ? "kdrq" : input.sidx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
214
|
List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
215
216
217
|
DateTime? startKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.First()) : null;
DateTime? endKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.Last()) : null;
var data = await _db.Queryable<LqKdKdjlbEntity>()
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
218
|
.WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Kdhyc.Contains(input.keyword) || p.Kdhysjh.Contains(input.keyword))
|
96009bc9
hexiaodong
hxd
|
219
220
221
|
.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...
|
222
223
|
.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
|
224
225
|
.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...
|
226
227
228
|
.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
|
229
|
.WhereIF(!string.IsNullOrEmpty(input.ckfs), p => p.Ckfs.Equals(input.ckfs))
|
96009bc9
hexiaodong
hxd
|
230
231
232
233
234
235
236
237
238
239
|
.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...
|
240
|
.WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
241
|
.WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
242
|
.WhereIF(!string.IsNullOrEmpty(input.CreateUser), p => p.CreateUser.Equals(input.CreateUser))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
243
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
244
|
.Select(it => new LqKdKdjlbListOutput
|
96009bc9
hexiaodong
hxd
|
245
246
|
{
id = it.Id,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
247
248
249
250
251
252
253
254
255
|
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”
更新门店目标设定相关功能,新增字段...
|
256
257
258
259
260
|
fkfs = it.Fkfs,
fkyy = it.Fkyy,
fkpd = it.Fkpd,
khly = it.Khly,
tjr = it.Tjr,
|
41da4257
“wangming”
Refactor LqEventS...
|
261
|
deductAmount = it.DeductAmount,
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
262
263
|
paidDebt = it.PaidDebt,
supplementBillingId = it.SupplementBillingId,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
264
265
266
267
|
sfskdd = it.Sfskdd,
jj = it.Jj,
bz = it.Bz,
kdhy = it.Kdhy,
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
268
269
|
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: 删除考勤汇总表相关功能...
|
270
271
272
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
273
274
|
activityId = it.ActivityId,
activityName = SqlFunc.Subqueryable<LqPackageInfoEntity>().Where(x => x.Id == it.ActivityId).Select(x => x.ActivityName),
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
275
276
277
278
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
279
280
281
|
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
282
283
284
285
|
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
|
1cf1bd86
“wangming”
feat: 添加项目资料表手工费字...
|
286
|
itemDetails = await _db.Queryable<LqKdPxmxEntity>().Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
|
.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>();
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
319
|
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
320
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
321
|
#endregion
|
96009bc9
hexiaodong
hxd
|
322
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
323
|
#region 新建开单记录表
|
96009bc9
hexiaodong
hxd
|
324
325
326
327
328
329
330
331
332
333
|
/// <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
|
334
|
var HealthInstructorNames = "";
|
96009bc9
hexiaodong
hxd
|
335
|
entity.Id = YitIdHelper.NextId().ToString();
|
d98270e2
“wangming”
Enhance LqEventSe...
|
336
337
|
entity.CreateTime = DateTime.Now;
entity.UpdateTime = DateTime.Now;
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
338
|
entity.IsEffective = StatusEnum.有效.GetHashCode();
|
96009bc9
hexiaodong
hxd
|
339
340
341
342
|
try
{
//开启事务
_db.BeginTran();
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
343
|
//判断是否有作废关联id
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
//暂时先不需要
// if (!string.IsNullOrEmpty(input.cancelRefId))
// {
// //查询作废关联id
// var cancelRefEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.cancelRefId);
// if (cancelRefEntity == null || cancelRefEntity.IsEffective == StatusEnum.无效.GetHashCode())
// {
// throw NCCException.Oh("该开单记录已经作废");
// }
// // 检查作废关联记录是否可以作废
// var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(input.cancelRefId);
// if (!canCancel)
// {
// throw NCCException.Oh(errorMessage);
// }
// //将作废关联id的IsEffective设置为无效
// cancelRefEntity.IsEffective = StatusEnum.无效.GetHashCode();
// await _db.Updateable(cancelRefEntity).ExecuteCommandAsync();
// //把品项明细表的IsEffective设置为无效
// await _db.Updateable<LqKdPxmxEntity>().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
// //把健康师业绩表的IsEffective设置为无效
// await _db.Updateable<LqKdJksyjEntity>().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
// //把科技部老师业绩表的IsEffective设置为无效
// await _db.Updateable<LqKdKjbsyjEntity>().Where(p => p.Glkdbh == input.cancelRefId).UpdateColumns(p => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
// //把扣款信息表的IsEffective设置为无效
// await _db.Updateable<LqKdDeductinfoEntity>().Where(p => p.BillingId == input.cancelRefId).UpdateColumns(p => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
// }
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
372
|
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
373
374
375
376
377
378
379
380
381
382
383
384
|
//判断是否有补缴开单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: 删除考勤汇总表相关功能...
|
385
386
|
supplementBillingEntity.PaidDebt += input.supplementAmount > supplementAmount ? supplementAmount : input.supplementAmount;
await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
387
388
|
}
|
96009bc9
hexiaodong
hxd
|
389
|
//新增开单记录表记录
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
390
|
entity.CreateUser = userInfo.userId;
|
41da4257
“wangming”
Refactor LqEventS...
|
391
|
entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);//计算储扣总金额
|
c842ad9a
“wangming”
Remove analyze_ex...
|
392
|
var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
393
394
395
396
397
|
//循环品相信息
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
|
b45d55f7
“wangming”
Refactor LqEventS...
|
398
399
400
401
402
403
404
405
406
407
408
|
var allDeductEntities = new List<LqKdDeductinfoEntity>();
// 处理扣款信息列表
foreach (var item in input.lqKdKdjlbDeductList)
{
var lqKdDeductEntity = new LqKdDeductinfoEntity
{
Id = YitIdHelper.NextId().ToString(),
BillingId = newEntity.Id,
DeductId = item.DeductId,
DeductType = item.DeductType,
Amount = item.Amount,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
409
410
411
412
413
414
|
ProjectNumber = item.ProjectNumber,
UnitPrice = item.UnitPrice,
ItemName = item.ItemName,
ItemId = item.ItemId,
IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
CreateTime = DateTime.Now, // 设置创建时间
|
b45d55f7
“wangming”
Refactor LqEventS...
|
415
416
417
|
};
allDeductEntities.Add(lqKdDeductEntity);
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
418
419
|
// 处理品项明细列表
foreach (var item in input.lqKdPxmxList)
|
96009bc9
hexiaodong
hxd
|
420
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
421
422
|
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
|
96009bc9
hexiaodong
hxd
|
423
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
424
425
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
|
dac8767e
“wangming”
111111111
|
426
|
Yjsj = input.kdrq,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
427
428
|
CreateTIme = DateTime.Now,
MemberId = entity.Kdhy,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
429
|
IsEnabled = StatusEnum.有效.GetHashCode(),
|
023505ba
“wangming”
Enhance LqEventSe...
|
430
431
|
ProjectNumber = item.projectNumber,
TotalPrice = (decimal)(item.pxjg * item.projectNumber),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
432
433
434
435
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
|
850bf205
“wangming”
Add ActualPrice f...
|
436
|
ActualPrice = item.actualPrice,
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
437
438
|
Remark = item.remark,
IsEffective = StatusEnum.有效.GetHashCode(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
439
|
ActivityId = input.activityId,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
440
441
|
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
442
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
443
444
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
|
96009bc9
hexiaodong
hxd
|
445
|
{
|
28404662
“wangming”
1111
|
446
|
//把jksxm保存到HealthInstructorNames
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
447
|
foreach (var ijks_tem in item.lqKdJksyjList)
|
06553fb7
“wangming”
1
|
448
|
{
|
28404662
“wangming”
1111
|
449
450
451
452
453
454
455
456
457
458
459
460
|
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: 完善开单欠款补缴记录功能
|
461
|
IsEffective = StatusEnum.有效.GetHashCode(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
462
|
ActivityId = input.activityId,
|
28404662
“wangming”
1111
|
463
|
});
|
06553fb7
“wangming”
1
|
464
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
465
|
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
466
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
467
468
469
470
|
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
|
06553fb7
“wangming”
1
|
471
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
472
473
474
475
476
477
478
479
480
481
482
483
484
|
allKjbsyjEntities.Add(new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = newEntity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = input.kdrq,
Kdpxid = lqKdPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
485
|
);
|
06553fb7
“wangming”
1
|
486
|
}
|
96009bc9
hexiaodong
hxd
|
487
|
}
|
96009bc9
hexiaodong
hxd
|
488
|
}
|
28404662
“wangming”
1111
|
489
|
|
28404662
“wangming”
1111
|
490
|
|
77fe03a4
“wangming”
feat: 完善开单欠款补缴记录功能
|
491
|
|
41da4257
“wangming”
Refactor LqEventS...
|
492
493
|
//通过会员id查询会员信息
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
|
759f9f27
“wangming”
123321
|
494
495
496
|
//通过开单记录表查询这个会员开单金额
var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
//如果开单金额小于500,为散客,如果大于500,为会员
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
497
|
if (kdAmount < 500 && kdAmount > 0)
|
759f9f27
“wangming”
123321
|
498
499
500
501
502
503
504
|
{
memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
}
else
{
memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
}
|
41da4257
“wangming”
Refactor LqEventS...
|
505
|
await _db.Updateable(memberInfo).ExecuteCommandAsync();
|
b45d55f7
“wangming”
Refactor LqEventS...
|
506
507
508
509
510
|
// 批量插入扣款信息
if (allDeductEntities.Any())
{
await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
511
512
513
514
|
// 批量插入品项明细
if (allPxmxEntities.Any())
{
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
515
516
517
518
519
520
521
522
523
524
525
|
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
526
527
|
//关闭事务
_db.CommitTran();
|
e5e15bcb
“wangming”
优化系统功能和性能
|
528
529
530
|
// 生成开单记录字符串并发送到企业微信
try
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
531
532
|
//判断如果开单金额大于0,则发送开单记录字符串到企业微信
if (newEntity.Sfyj > 0)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
533
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
534
535
|
var entityInfo = await GetInfo(newEntity.Id);
if (entityInfo != null)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
536
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
537
538
539
540
541
542
|
var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo, HealthInstructorNames);
Console.WriteLine("开单记录字符串生成成功:");
Console.WriteLine(orderRecordString);
// 发送到企业微信群
try
|
e5e15bcb
“wangming”
优化系统功能和性能
|
543
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
544
545
546
547
548
549
550
551
552
|
var sendResult = await _weChatBotService.SendOrderRecordMessage(orderRecordString);
if (sendResult)
{
Console.WriteLine("开单记录已成功发送到企业微信群");
}
else
{
Console.WriteLine("开单记录发送到企业微信群失败");
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
553
|
}
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
554
|
catch (Exception wechatEx)
|
e5e15bcb
“wangming”
优化系统功能和性能
|
555
|
{
|
7503d097
“wangming”
更新服务类:LqKdKdjlbSe...
|
556
|
Console.WriteLine($"发送企业微信消息异常: {wechatEx.Message}");
|
e5e15bcb
“wangming”
优化系统功能和性能
|
557
558
|
}
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
|
}
}
catch (Exception ex)
{
// 字符串生成失败不影响主流程,只记录日志
Console.WriteLine($"生成开单记录字符串失败: {ex.Message}");
}
}
catch (Exception ex)
{
//回滚事务
_db.RollbackTran();
Console.WriteLine($"开单创建失败: {ex.Message}");
Console.WriteLine($"异常堆栈: {ex.StackTrace}");
throw NCCException.Oh(ErrorCode.COM1000);
}
}
#endregion
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
578
|
#region 获取开单记录表无分页列表
|
96009bc9
hexiaodong
hxd
|
579
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
580
581
582
583
|
/// 获取开单记录表无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
584
585
586
587
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqKdKdjlbListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
588
|
List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
|
96009bc9
hexiaodong
hxd
|
589
590
591
592
593
594
|
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...
|
595
596
|
.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
|
597
598
|
.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...
|
599
600
601
|
.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
|
602
|
.WhereIF(!string.IsNullOrEmpty(input.ckfs), p => p.Ckfs.Equals(input.ckfs))
|
96009bc9
hexiaodong
hxd
|
603
604
605
606
607
608
609
610
611
612
|
.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...
|
613
|
.WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
|
c842ad9a
“wangming”
Remove analyze_ex...
|
614
|
.WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
615
|
.WhereIF(input.isEffective != 0, p => p.IsEffective == input.isEffective)
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
616
|
.Select(it => new LqKdKdjlbListOutput
|
96009bc9
hexiaodong
hxd
|
617
618
|
{
id = it.Id,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
619
620
621
622
623
624
625
626
627
|
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...
|
628
|
deductAmount = it.DeductAmount,
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
629
630
631
632
633
634
635
636
637
638
639
|
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: 删除考勤汇总表相关功能...
|
640
|
fileUrl = it.F_FIleUrl,
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
641
642
643
644
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
645
|
return data;
|
96009bc9
hexiaodong
hxd
|
646
|
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
647
|
#endregion
|
96009bc9
hexiaodong
hxd
|
648
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
649
|
#region 导出开单记录表
|
96009bc9
hexiaodong
hxd
|
650
|
/// <summary>
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
651
652
653
654
|
/// 导出开单记录表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
655
656
657
658
659
660
661
662
663
664
665
666
667
668
|
[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文件,优...
|
669
670
|
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
|
671
672
673
674
675
676
677
678
679
680
681
682
|
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...
|
683
|
excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
|
96009bc9
hexiaodong
hxd
|
684
685
686
687
688
|
}
}
var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
ExcelExportHelper<LqKdKdjlbListOutput>.Export(exportData, excelconfig, addPath);
var fileName = _userManager.UserId + "|" + addPath + "|xls";
|
c842ad9a
“wangming”
Remove analyze_ex...
|
689
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
690
691
|
return output;
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
692
|
#endregion
|
96009bc9
hexiaodong
hxd
|
693
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
694
|
#region 批量删除开单记录表
|
96009bc9
hexiaodong
hxd
|
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
|
/// <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...
|
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
|
// 检查是否有消耗记录
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
|
726
|
//批量删除开单记录表
|
c842ad9a
“wangming”
Remove analyze_ex...
|
727
|
await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
728
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
729
|
//清空健康师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
730
|
await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
731
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
732
|
//清空科技部老师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
733
|
await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
734
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
735
|
//清空品项明细
|
c842ad9a
“wangming”
Remove analyze_ex...
|
736
|
await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
737
738
739
740
|
//清空扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().In(u => u.BillingId, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
741
742
743
|
//关闭事务
_db.CommitTran();
}
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
744
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
745
746
747
|
{
//回滚事务
_db.RollbackTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
748
|
throw NCCException.Oh($"批量删除开单记录表失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
749
750
751
|
}
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
752
|
#endregion
|
96009bc9
hexiaodong
hxd
|
753
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
754
|
#region 更新开单记录表
|
96009bc9
hexiaodong
hxd
|
755
756
757
|
/// <summary>
/// 更新开单记录表
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
758
759
|
/// <remarks>
/// 更新开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
760
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
|
/// 示例请求:
/// ```json
/// {
/// "id": "开单编号",
/// "djmd": "单据门店",
/// "jsj": "金三角",
/// "kdrq": "2025-01-11",
/// "lqKdPxmxList": [
/// {
/// "px": "品项编号",
/// "pxmc": "品项名称",
/// "pxjg": 100.00,
/// "projectNumber": 1,
/// "sourceType": "购买",
/// "lqKdJksyjList": [
/// {
/// "jks": "健康师",
/// "jksxm": "健康师姓名",
/// "jksyj": "100"
/// }
/// ]
/// }
/// ]
/// }
/// ```
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
786
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
787
788
789
790
791
792
793
794
795
796
|
/// 参数说明:
/// - id: 开单记录主键ID
/// - input: 开单记录更新参数,包含品项明细和业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <param name="input">开单记录更新参数</param>
/// <returns>无返回值</returns>
/// <response code="200">更新成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
|
96009bc9
hexiaodong
hxd
|
797
798
799
800
801
802
803
804
|
[HttpPut("{id}")]
public async Task Update(string id, [FromBody] LqKdKdjlbUpInput input)
{
var entity = input.Adapt<LqKdKdjlbEntity>();
try
{
//开启事务
_db.BeginTran();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
805
|
|
96009bc9
hexiaodong
hxd
|
806
|
//更新开单记录表记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
807
|
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
808
809
|
//清空原有数据
|
c842ad9a
“wangming”
Remove analyze_ex...
|
810
811
812
|
await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
813
814
815
816
817
818
819
820
|
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
// 处理品项明细列表
if (input.lqKdPxmxList != null && input.lqKdPxmxList.Any())
|
96009bc9
hexiaodong
hxd
|
821
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
822
|
foreach (var item in input.lqKdPxmxList)
|
96009bc9
hexiaodong
hxd
|
823
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
824
825
826
827
828
829
830
831
|
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = entity.Id,
CreateTIme = DateTime.Now,
MemberId = entity.Kdhy,
IsEnabled = 0,
|
d98270e2
“wangming”
Enhance LqEventSe...
|
832
833
|
ProjectNumber = item.projectNumber == 0 ? 1 : item.projectNumber,
TotalPrice = (decimal)(item.pxjg * (item.projectNumber == 0 ? 1 : item.projectNumber)),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
834
835
836
837
838
839
|
Px = item.px,
Pxmc = item.pxmc,
Pxjg = item.pxjg,
SourceType = item.sourceType,
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
840
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
841
842
843
844
845
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
{
foreach (var ijks_tem in item.lqKdJksyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
846
847
848
849
850
851
852
853
854
855
856
857
858
859
|
allJksyjEntities.Add(
new LqKdJksyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = entity.Id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = DateTime.Now,
Jsj_id = ijks_tem.jsj_id,
Kdpxid = lqKdPxmxEntity.Id,
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
860
861
|
}
}
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
862
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
863
864
865
866
867
|
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
{
|
00486d53
“wangming”
更新多个.DS_Store文件,优...
|
868
869
870
871
872
873
874
875
876
877
878
879
880
|
allKjbsyjEntities.Add(
new LqKdKjbsyjEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = entity.Id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = DateTime.Now,
Kdpxid = lqKdPxmxEntity.Id,
}
);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
881
882
|
}
}
|
96009bc9
hexiaodong
hxd
|
883
|
}
|
96009bc9
hexiaodong
hxd
|
884
885
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
886
887
|
// 批量插入品项明细
if (allPxmxEntities.Any())
|
96009bc9
hexiaodong
hxd
|
888
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
889
|
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
890
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
891
892
|
// 批量插入健康师业绩
if (allJksyjEntities.Any())
|
96009bc9
hexiaodong
hxd
|
893
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
894
895
896
897
898
899
|
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
900
|
}
|
96009bc9
hexiaodong
hxd
|
901
902
903
904
905
906
907
908
909
910
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1001);
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
911
|
#endregion
|
96009bc9
hexiaodong
hxd
|
912
|
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
913
|
#region 删除开单记录表
|
96009bc9
hexiaodong
hxd
|
914
915
916
917
918
919
920
921
922
923
924
925
926
|
/// <summary>
/// 删除开单记录表
/// </summary>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task Delete(string id)
{
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
_ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
try
{
//开启事务
_db.BeginTran();
|
544fd30b
“wangming”
feat: 增强LqKdKdjlb...
|
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
|
//先查询开单品项明细
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”
更新门店目标设定相关功能,新增字段...
|
947
|
|
96009bc9
hexiaodong
hxd
|
948
|
//删除开单记录表记录
|
c842ad9a
“wangming”
Remove analyze_ex...
|
949
|
await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
950
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
951
|
//清空健康师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
952
|
await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
953
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
954
|
//清空科技部老师业绩
|
c842ad9a
“wangming”
Remove analyze_ex...
|
955
|
await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
956
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
957
|
//清空品项明细
|
c842ad9a
“wangming”
Remove analyze_ex...
|
958
|
await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
959
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
960
961
962
|
//清空扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().Where(u => u.BillingId == id).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
963
964
965
|
//关闭事务
_db.CommitTran();
}
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
966
|
catch (Exception ex)
|
96009bc9
hexiaodong
hxd
|
967
968
969
|
{
//回滚事务
_db.RollbackTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
970
|
throw NCCException.Oh($"删除开单记录表失败: {ex.Message}");
|
96009bc9
hexiaodong
hxd
|
971
972
|
}
}
|
2ce7c3cb
“wangming”
更新门店目标设定相关功能,新增字段...
|
973
|
#endregion
|
b45d55f7
“wangming”
Refactor LqEventS...
|
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
|
#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”
对开单加上了是否有效的逻辑,完善了...
|
993
|
|
5dc762df
“wangming”
Enhance performan...
|
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
|
#region 获取状态枚举内容(所有的状态通用)
/// <summary>
/// 获取状态枚举内容
/// </summary>
/// <returns>状态枚举列表</returns>
[HttpGet("status-enum")]
public List<EnumOutput> GetStatusEnum()
{
return Enum.GetValues<StatusEnum>()
.Select(e => new EnumOutput
{
Value = (int)e,
Name = e.ToString(),
Description = e.GetDescription(),
})
.ToList();
}
#endregion
|
ada64779
“wangming”
refactor: 简化开单记录修...
|
1013
|
#region 修改开单记录
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1014
|
/// <summary>
|
ada64779
“wangming”
refactor: 简化开单记录修...
|
1015
|
/// 修改开单记录
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
|
/// </summary>
/// <remarks>
/// 更新开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
///
/// 示例请求:
/// ```json
/// {
/// "id": "开单编号",
/// "djmd": "单据门店",
/// "jsj": "金三角",
/// "kdrq": "2025-01-11",
/// "lqKdPxmxList": [
/// {
/// "px": "品项编号",
/// "pxmc": "品项名称",
/// "pxjg": 100.00,
/// "projectNumber": 1,
/// "sourceType": "购买",
/// "lqKdJksyjList": [
/// {
/// "jks": "健康师",
/// "jksxm": "健康师姓名",
/// "jksyj": "100"
/// }
/// ]
/// }
/// ]
/// }
/// ```
///
/// 参数说明:
/// - id: 开单记录主键ID
/// - input: 开单记录更新参数,包含品项明细和业绩信息
/// </remarks>
/// <param name="id">开单记录主键ID</param>
/// <param name="input">开单记录更新参数</param>
/// <returns>无返回值</returns>
/// <response code="200">更新成功</response>
/// <response code="400">参数错误或数据验证失败</response>
/// <response code="500">服务器内部错误</response>
[HttpPut("UpdateForNoDelete/{id}")]
public async Task UpdateForNoDelete(string id, [FromBody] LqKdKdjlbUpInput input)
{
var entity = input.Adapt<LqKdKdjlbEntity>();
entity.Id = id; // 确保ID正确设置
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1061
1062
|
try
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1063
1064
1065
1066
1067
1068
|
//检查开单记录是否可以操作
var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(id);
if (!canCancel)
{
throw NCCException.Oh(errorMessage);
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1069
1070
|
//开启事务
_db.BeginTran();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
|
//查询是否有对应的补缴开单ID
if (!string.IsNullOrEmpty(entity.SupplementBillingId))
{
//查询补缴开单ID
var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == entity.SupplementBillingId);//900,900
if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode())
{
throw NCCException.Oh("补缴开单记录不存在或已作废");
}
//查询当前开单已经补缴金额
var OldSupplementAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.Id == id).SumAsync(p => p.SupplementAmount);//900,0
supplementBillingEntity.PaidDebt = supplementBillingEntity.PaidDebt - OldSupplementAmount + input.supplementAmount;
await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1085
|
// 更新开单记录主表
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1086
|
await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).IgnoreColumns(x => x.CreateTime).ExecuteCommandAsync();
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1087
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
|
//清空原有品项明细
await _db.Deleteable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
//清空原有健康师业绩
await _db.Deleteable<LqKdJksyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
//清空原有科技部老师业绩
await _db.Deleteable<LqKdKjbsyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
//清空原有扣款信息
await _db.Deleteable<LqKdDeductinfoEntity>().Where(x => x.BillingId == id).ExecuteCommandAsync();
//循环品相信息
// 收集所有需要插入的实体,然后批量插入
var allPxmxEntities = new List<LqKdPxmxEntity>();
var allJksyjEntities = new List<LqKdJksyjEntity>();
var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
var allDeductEntities = new List<LqKdDeductinfoEntity>();
// 处理扣款信息列表
foreach (var item in input.lqKdKdjlbDeductList)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1104
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
|
var lqKdDeductEntity = new LqKdDeductinfoEntity
{
Id = YitIdHelper.NextId().ToString(),
BillingId = id,
DeductId = item.DeductId,
DeductType = item.DeductType,
Amount = item.Amount,
ProjectNumber = item.ProjectNumber,
UnitPrice = item.UnitPrice,
ItemName = item.ItemName,
ItemId = item.ItemId,
IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
CreateTime = DateTime.Now, // 设置创建时间
};
allDeductEntities.Add(lqKdDeductEntity);
}
// 处理品项明细列表
foreach (var item in input.lqKdPxmxList)
{
// 创建品项明细实体
var lqKdPxmxEntity = new LqKdPxmxEntity
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1126
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
|
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,
};
allPxmxEntities.Add(lqKdPxmxEntity);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1145
|
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1146
1147
1148
1149
1150
|
// 收集该品项关联的健康师业绩
if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
{
//把jksxm保存到HealthInstructorNames
foreach (var ijks_tem in item.lqKdJksyjList)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1151
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1152
|
allJksyjEntities.Add(new LqKdJksyjEntity
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1153
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = id,
Jks = ijks_tem.jks,
Jksxm = ijks_tem.jksxm,
Jkszh = ijks_tem.jkszh,
Jksyj = ijks_tem.jksyj,
Yjsj = input.kdrq,
Jsj_id = ijks_tem.jsj_id,
Kdpxid = lqKdPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
});
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1166
|
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1167
1168
1169
1170
1171
1172
|
}
// 收集该品项关联的科技部老师业绩
if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
{
foreach (var ikjbs_tem in item.lqKdKjbsyjList)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1173
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1174
|
allKjbsyjEntities.Add(new LqKdKjbsyjEntity
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1175
1176
|
{
Id = YitIdHelper.NextId().ToString(),
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1177
1178
1179
1180
1181
1182
1183
1184
1185
|
Glkdbh = id,
Kjbls = ikjbs_tem.kjbls,
Kjblsxm = ikjbs_tem.kjblsxm,
Kjblszh = ikjbs_tem.kjblszh,
Kjblsyj = ikjbs_tem.kjblsyj,
Yjsj = input.kdrq,
Kdpxid = lqKdPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode(),
ActivityId = input.activityId,
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1186
|
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1187
|
);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1188
1189
1190
1191
|
}
}
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
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
|
//通过会员id查询会员信息
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
//通过开单记录表查询这个会员开单金额
var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
//如果开单金额小于500,为散客,如果大于500,为会员
if (kdAmount < 500)
{
memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
}
else
{
memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
}
await _db.Updateable(memberInfo).ExecuteCommandAsync();
// 批量插入扣款信息
if (allDeductEntities.Any())
{
await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
}
// 批量插入品项明细
if (allPxmxEntities.Any())
{
await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
}
// 批量插入健康师业绩
if (allJksyjEntities.Any())
{
await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
}
// 批量插入科技部老师业绩
if (allKjbsyjEntities.Any())
{
await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1229
1230
1231
|
//关闭事务
_db.CommitTran();
}
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
1232
|
catch (Exception ex)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1233
1234
1235
|
{
//回滚事务
_db.RollbackTran();
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
1236
|
throw NCCException.Oh($"创建开单记录失败: {ex.Message}");
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1237
1238
1239
1240
|
}
}
#endregion
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1241
1242
1243
1244
|
#region 作废开单记录
/// <summary>
/// 作废开单记录
/// </summary>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1245
|
/// <param name="input">作废开单记录输入</param>
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1246
|
/// <returns>无返回值</returns>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
|
/// <remarks>
/// 作废指定的开单记录,包括相关的品项明细、业绩记录等
///
/// 示例请求:
/// ```json
/// {
/// "id": "123456789",
/// "remarks": "客户要求作废此订单"
/// }
/// ```
///
/// 参数说明:
/// - id: 开单记录主键ID(必填)
/// - remarks: 作废备注说明
/// </remarks>
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1262
1263
1264
1265
|
/// <response code="200">作废成功</response>
/// <response code="400">参数错误,开单记录ID不能为空</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1266
1267
|
[HttpPut("Cancel")]
public async Task Cancel(CancelBillingInput input)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1268
|
{
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1269
|
if (string.IsNullOrEmpty(input.Id))
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1270
1271
1272
|
{
throw NCCException.Oh("开单记录ID不能为空");
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1273
1274
1275
1276
|
try
{
//开启事务
_db.BeginTran();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1277
1278
1279
1280
1281
1282
|
// 检查开单记录是否可以作废
var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(input.Id);
if (!canCancel)
{
throw NCCException.Oh(errorMessage);
}
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1283
1284
|
// 查询开单记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1285
|
var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.Id);
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1286
1287
1288
1289
1290
|
if (entity == null)
{
throw NCCException.Oh("开单记录不存在");
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1291
1292
1293
1294
|
// 标记开单记录为无效,并添加作废备注
entity.IsEffective = StatusEnum.无效.GetHashCode();
entity.CancelRefRemarks = input.Remarks;
entity.UpdateTime = DateTime.Now;
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1295
|
await _db.Updateable(entity).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1296
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1297
|
// 标记对应开单明细表为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1298
|
await _db.Updateable<LqKdPxmxEntity>().SetColumns(it => new LqKdPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1299
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1300
|
// 标记健康师业绩为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1301
|
await _db.Updateable<LqKdJksyjEntity>().SetColumns(it => new LqKdJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1302
|
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1303
|
// 标记科技部老师业绩为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1304
|
await _db.Updateable<LqKdKjbsyjEntity>().SetColumns(it => new LqKdKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.Glkdbh == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1305
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1306
|
// 标记开单_储扣详细表为无效
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1307
|
await _db.Updateable<LqKdDeductinfoEntity>().SetColumns(it => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(it => it.BillingId == input.Id).ExecuteCommandAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1308
|
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
|
//如果存在补缴开单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”
对开单加上了是否有效的逻辑,完善了...
|
1319
1320
1321
|
//关闭事务
_db.CommitTran();
}
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1322
|
catch (Exception ex)
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1323
1324
1325
|
{
//回滚事务
_db.RollbackTran();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1326
|
throw NCCException.Oh($"作废开单记录失败: {ex.Message}");
|
86e6cb70
“wangming”
对开单加上了是否有效的逻辑,完善了...
|
1327
1328
1329
1330
|
}
}
#endregion
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
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
1393
1394
|
#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”
优化系统功能和性能
|
1395
1396
1397
1398
1399
|
// 2. 批量处理数据,每批1000条
const int batchSize = 1000;
var totalBatches = (int)Math.Ceiling((double)historyData.Count / batchSize);
for (int batchIndex = 0; batchIndex < totalBatches; batchIndex++)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1400
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1401
|
var batchData = historyData.Skip(batchIndex * batchSize).Take(batchSize).ToList();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1402
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1403
1404
1405
1406
1407
1408
|
var kdjlbEntities = new List<LqKdKdjlbEntity>();
var pxmxEntities = new List<LqKdPxmxEntity>();
foreach (var item in batchData)
{
try
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1409
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
|
// 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”
新增历史会员权益数据导入功能
|
1437
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
|
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”
新增历史会员权益数据导入功能
|
1455
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1456
|
pxmxEntities.Add(pxmxEntity);
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1457
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1458
1459
1460
|
successCount++;
}
catch (Exception ex)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1461
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1462
1463
1464
1465
|
errorCount++;
errorMessages.Add($"处理记录 {(string)item.会员编号}-{(string)item.品项名称} 时出错: {ex.Message}");
}
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1466
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1467
1468
1469
1470
1471
|
// 6. 批量插入开单记录
if (kdjlbEntities.Any())
{
await _db.Insertable(kdjlbEntities).ExecuteCommandAsync();
}
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1472
|
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1473
1474
1475
1476
|
// 7. 批量插入品项明细
if (pxmxEntities.Any())
{
await _db.Insertable(pxmxEntities).ExecuteCommandAsync();
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1477
|
}
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1478
1479
1480
|
// 8. 显示进度
if (batchIndex % 10 == 0)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1481
|
{
|
e5e15bcb
“wangming”
优化系统功能和性能
|
1482
|
Console.WriteLine($"已处理 {batchIndex + 1}/{totalBatches} 批次,成功 {successCount} 条,失败 {errorCount} 条");
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
|
}
}
_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: 完善开单欠款补缴记录功能
|
1499
|
catch (Exception ex)
|
1e118117
“wangming”
新增历史会员权益数据导入功能
|
1500
1501
1502
1503
1504
1505
|
{
_db.RollbackTran();
throw NCCException.Oh($"导入历史会员权益数据失败: {ex.Message}");
}
}
#endregion
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1506
|
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1507
|
#region 根据门店获取该门店的欠款记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1508
|
/// <summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1509
|
/// 根据门店获取该门店的欠款记录
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1510
|
/// </summary>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1511
1512
|
/// <param name="input">查询参数</param>
/// <returns>分页的欠款记录</returns>
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1513
|
/// <remarks>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1514
|
/// 获取指定门店的欠款记录,考虑已缴欠款情况,支持分页
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1515
1516
1517
1518
|
///
/// 示例请求:
/// ```json
/// {
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1519
1520
1521
1522
1523
|
/// "storeId": "门店ID",
/// "currentPage": 1,
/// "pageSize": 10,
/// "sidx": "Kdrq",
/// "sort": "desc"
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1524
1525
1526
1527
|
/// }
/// ```
///
/// 参数说明:
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1528
1529
1530
1531
1532
1533
1534
1535
1536
|
/// - storeId: 门店ID,必填
/// - currentPage: 当前页码
/// - pageSize: 每页大小
/// - sidx: 排序字段,默认按开单日期
/// - sort: 排序方式,默认降序
///
/// 返回说明:
/// - 只返回仍有欠款的记录(总欠款 > 已缴欠款)
/// - 包含开单编号、客户信息、欠款金额、已缴金额等
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1537
|
/// </remarks>
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1538
1539
1540
1541
1542
|
/// <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”
优化开单记录作废功能:添加详细错误...
|
1543
1544
1545
|
{
try
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1546
|
if (string.IsNullOrEmpty(input.StoreId))
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1547
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1548
|
throw NCCException.Oh("门店ID不能为空");
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1549
|
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1550
1551
1552
1553
1554
1555
1556
|
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”
优化开单记录作废功能:添加详细错误...
|
1557
|
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
|
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: 删除考勤汇总表相关功能...
|
1568
|
paidDebt = it.PaidDebt,
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
|
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: 新增门店类别枚举和耗卡...
|
1579
1580
|
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: 删除考勤汇总表相关功能...
|
1581
1582
1583
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1584
1585
1586
1587
1588
1589
|
})
.MergeTable()
.OrderBy(sidx + " " + sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(debtRecords);
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1590
1591
1592
|
}
catch (Exception ex)
{
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
1593
|
throw NCCException.Oh($"获取门店欠款记录失败: {ex.Message}");
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
1594
1595
1596
1597
|
}
}
#endregion
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
|
#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: 删除考勤汇总表相关功能...
|
1665
1666
1667
|
isEffective = it.IsEffective,
createUser = it.CreateUser,
createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
|
ce74473f
“wangming”
feat: 新增门店类别枚举和耗卡...
|
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
// 获取当前页的开单记录ID列表
var billingIds = data.list.Select(x => x.id).ToList();
// 批量查询品项明细
var itemDetails = new List<LqKdPxmxInfoOutput>();
if (billingIds.Any())
{
itemDetails = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
.Select(x => new LqKdPxmxInfoOutput
{
id = x.Id,
glkdbh = x.Glkdbh,
px = x.Px,
pxmc = x.Pxmc,
pxjg = x.Pxjg,
projectNumber = x.ProjectNumber,
isEnabled = x.IsEnabled,
sourceType = x.SourceType,
memberId = x.MemberId,
createTime = x.CreateTIme,
totalPrice = x.TotalPrice,
actualPrice = x.ActualPrice,
remark = x.Remark,
isEffective = x.IsEffective
})
.ToListAsync();
}
// 按开单ID分组品项明细
var itemDetailsGrouped = itemDetails.GroupBy(x => x.glkdbh)
.ToDictionary(g => g.Key, g => g.ToList());
// 为每个开单记录分配品项明细
foreach (var item in data.list)
{
item.ItemDetails = itemDetailsGrouped.ContainsKey(item.id)
? itemDetailsGrouped[item.id]
: new List<LqKdPxmxInfoOutput>();
}
return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
}
catch (Exception ex)
{
throw NCCException.Oh($"获取会员开单记录失败: {ex.Message}");
}
}
#endregion
|
b31159d8
“wangming”
feat: 删除考勤汇总表相关功能...
|
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
|
#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: 完善开单记录汇总查询功能
|
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
|
#region 修改开单金额
/// <summary>
/// 修改开单金额
/// </summary>
/// <param name="input">修改开单金额输入</param>
/// <returns>修改结果</returns>
/// <remarks>
/// 修改开单记录表的金额以及品项明细表里面的金额
///
/// 示例请求:
/// ```json
/// {
/// "billingId": "123456789",
/// "zdyj": 1000.00,
/// "sfyj": 800.00,
/// "deductAmount": 200.00,
/// "qk": 0.00,
/// "itemDetails": [
/// {
/// "itemDetailId": "item001",
/// "pxjg": 500.00,
/// "totalPrice": 500.00,
/// "actualPrice": 400.00
/// }
/// ],
/// "remark": "金额调整"
/// }
/// ```
///
/// 参数说明:
/// - billingId: 开单记录ID(必填)
/// - zdyj: 整单业绩
/// - sfyj: 实付业绩
/// - deductAmount: 储扣总金额
/// - qk: 欠款
/// - itemDetails: 品项明细金额列表
/// - remark: 修改备注
/// </remarks>
/// <response code="200">成功修改开单金额</response>
/// <response code="400">请求参数错误</response>
/// <response code="404">开单记录不存在</response>
/// <response code="500">服务器内部错误</response>
[HttpPut("UpdateBillingAmount")]
public async Task<dynamic> UpdateBillingAmount(LqKdKdjlbUpdateAmountInput input)
{
try
{
// 验证输入参数
if (string.IsNullOrEmpty(input.BillingId))
{
throw NCCException.Oh("开单记录ID不能为空");
}
// 检查开单记录是否存在且有效
var billingEntity = await _db.Queryable<LqKdKdjlbEntity>().Where(w => w.Id == input.BillingId && w.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
if (billingEntity == null)
{
throw NCCException.Oh("开单记录不存在或已作废");
}
// 验证品项明细
if (input.ItemDetails != null && input.ItemDetails.Any())
{
var itemDetailIds = input.ItemDetails.Select(x => x.ItemDetailId).ToList();
var existingItems = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == input.BillingId && itemDetailIds.Contains(w.Id)).ToListAsync();
if (existingItems.Count != input.ItemDetails.Count)
{
throw NCCException.Oh("部分品项明细不存在或不属于该开单记录");
}
}
// 开始事务
_db.BeginTran();
try
{
// 更新开单记录金额
var updateResult = await _db.Updateable<LqKdKdjlbEntity>().SetColumns(it => new LqKdKdjlbEntity
{
Zdyj = input.Zdyj,
Sfyj = input.Sfyj,
DeductAmount = input.DeductAmount,
Qk = input.Qk,
UpdateTime = DateTime.Now
}).Where(w => w.Id == input.BillingId).ExecuteCommandAsync();
if (updateResult <= 0)
{
throw NCCException.Oh("更新开单记录金额失败");
}
// 更新品项明细金额
if (input.ItemDetails != null && input.ItemDetails.Any())
{
foreach (var itemDetail in input.ItemDetails)
{
var itemUpdateResult = await _db.Updateable<LqKdPxmxEntity>().SetColumns(it => new LqKdPxmxEntity
{
Pxjg = itemDetail.Pxjg,
TotalPrice = itemDetail.TotalPrice,
ActualPrice = itemDetail.ActualPrice
}).Where(w => w.Id == itemDetail.ItemDetailId && w.Glkdbh == input.BillingId).ExecuteCommandAsync();
if (itemUpdateResult <= 0)
{
throw NCCException.Oh($"更新品项明细金额失败,品项ID: {itemDetail.ItemDetailId}");
}
}
}
// 提交事务
_db.CommitTran();
return "修改开单金额成功";
}
catch (Exception ex)
{
// 回滚事务
_db.RollbackTran();
throw NCCException.Oh($"修改开单金额失败: {ex.Message}");
}
}
catch (Exception ex)
{
throw NCCException.Oh($"修改开单金额时发生错误: {ex.Message}");
}
}
#endregion
#region 获取门店某个时间段的开单记录汇总信息
/// <summary>
/// 获取门店某个时间段的开单记录汇总信息
/// </summary>
/// <param name="input">查询参数</param>
/// <returns>开单记录汇总信息</returns>
[HttpGet("GetBillingRecordSummaryByStoreId")]
public async Task<dynamic> GetBillingRecordSummaryByStoreId([FromQuery] BillingRecordSummaryQueryInput input)
{
try
{
// 验证参数
if (string.IsNullOrEmpty(input.StoreId))
{
throw NCCException.Oh("门店ID不能为空");
}
// 如果开始时间和结束时间为空,就默认是当月
if (input.StartTime == null || input.EndTime == null)
{
input.StartTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
input.EndTime = DateTime.Now.AddDays(DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month));
}
// 查询开单记录
var billingRecords = await _db.Queryable<LqKdKdjlbEntity>()
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
1896
|
.Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode())
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
|
.Select(it => new
{
id = it.Id,
djmd = it.Djmd,
jsj = it.Jsj,
kdrq = it.Kdrq,
gjlx = it.Gjlx,
zdyj = it.Zdyj,
sfyj = it.Sfyj,
qk = it.Qk,
|
db3fff3e
“wangming”
fix: 修复门店顾客详情SQL查...
|
1907
1908
|
kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
|
fkfs = it.Fkfs, // 付款方式
khly = it.Khly, // 客户来源
bz = it.Bz, // 备注
createTime = it.CreateTime
})
.ToListAsync();
if (!billingRecords.Any())
{
return new
{
success = true,
data = new
{
billingSummary = new
{
totalCount = 0,
totalAmount = 0,
totalPaidAmount = 0,
totalDebt = 0,
billingRecords = new List<object>()
},
itemSummary = new
{
purchased = new { count = 0, totalAmount = 0, items = new List<object>() },
gifted = new { count = 0, totalAmount = 0, items = new List<object>() },
experience = new { count = 0, totalAmount = 0, items = new List<object>() }
},
healthTeacherSummary = new
{
totalCount = 0,
teachers = new List<object>()
}
},
message = "该时间段内无开单记录"
};
}
var billingIds = billingRecords.Select(x => x.id).ToList();
// 查询品项明细,按F_SourceType分类
var itemDetails = await _db.Queryable<LqKdPxmxEntity>()
.Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new
{
id = it.Id,
glkdbh = it.Glkdbh,
px = it.Px,
pxmc = it.Pxmc,
pxjg = it.Pxjg,
sourceType = it.SourceType,
totalPrice = it.TotalPrice,
actualPrice = it.ActualPrice,
projectNumber = it.ProjectNumber,
remark = it.Remark
})
.ToListAsync();
// 按来源类型分类品项
var purchasedItems = itemDetails.Where(x => x.sourceType == "购买").ToList();
var giftedItems = itemDetails.Where(x => x.sourceType == "赠送").ToList();
var experienceItems = itemDetails.Where(x => x.sourceType == "体验").ToList();
// 查询健康师业绩数据
var healthTeacherData = await _db.Queryable<LqKdJksyjEntity>()
.Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode())
.Select(it => new
{
id = it.Id,
glkdbh = it.Glkdbh,
jks = it.Jks,
jksxm = it.Jksxm,
jkszh = it.Jkszh,
jksyj = it.Jksyj,
kdpxid = it.Kdpxid,
yjsj = it.Yjsj,
jsj_id = it.Jsj_id
})
.ToListAsync();
// 构建按开单记录分组的详细数据
var detailedRecords = billingRecords.Select(billing => new
{
// 基本信息
date = billing.kdrq?.ToString("yyyy-MM-dd"),
customerName = billing.kdhyc,
customerPhone = billing.kdhysjh,
storeId = billing.djmd,
goldTriangle = billing.jsj,
customerType = billing.gjlx,
// 品项分类
purchasedItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "购买").Select(x => new
{
id = x.id,
itemName = x.pxmc,
itemCode = x.px,
price = x.pxjg,
totalPrice = x.totalPrice,
actualPrice = x.actualPrice,
projectNumber = x.projectNumber,
remark = x.remark
}).ToList(),
giftedItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "赠送").Select(x => new
{
id = x.id,
itemName = x.pxmc,
itemCode = x.px,
price = x.pxjg,
totalPrice = x.totalPrice,
actualPrice = x.actualPrice,
projectNumber = x.projectNumber,
remark = x.remark
}).ToList(),
experienceItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "体验").Select(x => new
{
id = x.id,
itemName = x.pxmc,
itemCode = x.px,
price = x.pxjg,
totalPrice = x.totalPrice,
actualPrice = x.actualPrice,
projectNumber = x.projectNumber,
remark = x.remark
}).ToList(),
// 金额信息
paidAmount = billing.sfyj,
debtAmount = billing.qk,
totalAmount = billing.zdyj,
// 健康师信息
healthTeachers = healthTeacherData.Where(x => x.glkdbh == billing.id).Select(x => new
{
teacherId = x.jks,
teacherName = x.jksxm,
teacherAccount = x.jkszh,
performance = x.jksyj,
performanceTime = x.yjsj,
itemDetailId = x.kdpxid,
goldTriangleId = x.jsj_id
}).ToList(),
// 其他信息
source = billing.khly, // 客户来源
paymentMethod = billing.fkfs, // 支付方式
remark = billing.bz, // 备注
createTime = billing.createTime
}).OrderByDescending(x => x.date).ToList();
// 构建返回结果
var result = new
{
success = true,
data = new
{
// 汇总统计
summary = new
{
totalCount = billingRecords.Count,
totalAmount = billingRecords.Sum(x => x.zdyj),
totalPaidAmount = billingRecords.Sum(x => x.sfyj),
totalDebt = billingRecords.Sum(x => x.qk),
totalPurchasedItems = purchasedItems.Count,
totalGiftedItems = giftedItems.Count,
totalExperienceItems = experienceItems.Count,
totalHealthTeachers = healthTeacherData.GroupBy(x => x.jks).Count()
},
// 详细记录列表
records = detailedRecords
},
message = "获取开单记录汇总信息成功"
};
return result;
}
catch (Exception ex)
{
throw NCCException.Oh($"获取开单记录汇总信息失败:{ex.Message}");
}
}
#endregion
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
|
#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相关...
|
2115
|
// 判断是否有对应的补缴记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2116
|
var qkbjList = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.SupplementBillingId == billingId && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2117
2118
2119
2120
|
if (qkbjList.Any())
{
return (false, "该开单记录有对应的补缴记录,不能进行操作");
}
|
2164125c
“wangming”
feat: 删除LqXhmxb相关...
|
2121
|
// 查询开单记录下的品项明细ID列表
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2122
|
var pxmxIdList = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Glkdbh == billingId && p.IsEffective == StatusEnum.有效.GetHashCode()).Select(p => p.Id).Distinct().ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2123
|
// 判断是否有对应的消耗记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2124
|
var xhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2125
2126
2127
2128
2129
|
if (xhPxmxList.Any())
{
return (false, "该开单记录有对应的消耗记录,不能进行操作");
}
// 判断是否有退卡记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2130
|
var hytkMxList = await _db.Queryable<LqHytkMxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2131
2132
2133
2134
2135
|
if (hytkMxList.Any())
{
return (false, "该开单记录有对应的退卡记录,不能进行操作");
}
// 判断是否已经有储扣记录
|
f987b6a6
“wangming”
feat: 完善开单记录汇总查询功能
|
2136
|
var deductInfoList = await _db.Queryable<LqKdDeductinfoEntity>().Where(p => pxmxIdList.Contains(p.DeductId) && p.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
|
3e508db5
“wangming”
优化开单记录作废功能:添加详细错误...
|
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
|
if (deductInfoList.Any())
{
return (false, "该开单记录有对应的储扣记录,不能进行操作");
}
return (true, string.Empty);
}
catch (Exception ex)
{
return (false, $"检查开单记录状态失败: {ex.Message}");
}
}
#endregion
|
7a9f4368
“wangming”
feat: 增强LqKdKdjlb...
|
2150
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2151
2152
2153
2154
2155
2156
2157
2158
|
#region 会员转卡操作
/// <summary>
/// 会员转卡操作
/// </summary>
/// <remarks>
/// 转卡是指一个会员把自己剩余的某些品项,转给另外一个会员
/// 转卡会员转出的品项,就做退卡操作
/// 被转卡会员收到的品项,做开卡操作
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2159
|
/// 系统会自动从原开单记录中获取健康师和科技部老师的业绩数据
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2160
2161
2162
2163
2164
2165
2166
|
///
/// 示例请求:
/// ```json
/// {
/// "fromMemberId": "member001",
/// "toMemberId": "member002",
/// "storeId": "store001",
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2167
2168
|
/// "signatureFile": "base64签名数据",
/// "remarks": "转卡备注信息",
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2169
2170
|
/// "transferItems": [
/// {
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2171
|
/// "billingItemId": "pxmx001",
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2172
|
/// "transferQuantity": 5,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2173
2174
|
/// "itemName": "美容项目A",
/// "itemPrice": 100.00
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2175
2176
2177
2178
2179
2180
|
/// }
/// ]
/// }
/// ```
///
/// 参数说明:
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
|
/// - fromMemberId: 转出会员ID(必填)
/// - toMemberId: 转入会员ID(必填)
/// - storeId: 门店ID(必填)
/// - signatureFile: 转出会员签名文件(必填)
/// - remarks: 转卡备注信息(可选)
/// - transferItems: 转出品项列表(必填)
/// - billingItemId: 开单品项明细ID(必填)
/// - transferQuantity: 转出数量(必填,大于0)
/// - itemName: 品项名称(必填)
/// - itemPrice: 品项价格(必填,大于等于0)
///
/// 业务规则:
/// - 转出和转入会员必须存在且有效
/// - 转出品项的剩余数量必须足够
/// - 系统会自动从原开单记录中获取健康师和科技部老师业绩数据
/// - 转卡操作会同时创建退卡记录和开卡记录
/// - 所有操作在事务中执行,确保数据一致性
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
|
/// </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: 实现转卡接口和库存管理功能
|
2211
2212
|
var userInfo = await _userManager.GetUserInfo();
var transferTime = DateTime.Now;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2213
2214
2215
2216
|
try
{
// 开启事务
_db.BeginTran();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
|
// 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: 实现转卡接口和库存管理功能
|
2228
2229
2230
2231
2232
2233
2234
2235
|
// 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: 实现转卡接口和库存管理功能
|
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
|
// 查询剩余数量
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
|
2246
|
var totalRefundAmount = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity);
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2247
|
var StoreEntity = await _db.Queryable<LqMdxxEntity>().Where(p => p.Id == input.StoreId).FirstAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
|
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...
|
2258
2259
|
Mdmc = StoreEntity.Dm,
Mdbh = StoreEntity.Mdbm,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2260
|
SignatureFile = input.SignatureFile,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2261
2262
2263
|
Hyzh = input.FromMemberId,
Gklx = fromMember.Khlx,
Tksj = DateTime.Now,
|
63df7ccb
“wangming”
1
|
2264
2265
|
Tkje = totalRefundAmount,
ActualRefundAmount = totalRefundAmount, // 转卡时实退金额等于退卡总金额
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2266
2267
2268
2269
2270
2271
2272
2273
|
Tkyy = "转卡",
Bz = $"转卡给会员:{toMember.Khmc},{input.Remarks}"
};
await _db.Insertable(refundEntity).ExecuteCommandAsync();
// 4. 创建退卡品项明细和业绩记录
var refundMxEntities = new List<LqHytkMxEntity>();
var refundJksyjEntities = new List<LqHytkJksyjEntity>();
|
63df7ccb
“wangming”
1
|
2274
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2275
2276
2277
2278
|
var refundKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
foreach (var item in input.TransferItems)
{
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2279
|
var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
|
63df7ccb
“wangming”
1
|
2280
|
//计算品项扣除总金额
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2281
|
var totalItemDeduction = item.ItemPrice * item.TransferQuantity;
|
63df7ccb
“wangming”
1
|
2282
|
//保存退卡明细表
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2283
2284
2285
2286
2287
|
var refundMxEntity = new LqHytkMxEntity
{
Id = YitIdHelper.NextId().ToString(),
RefundInfoId = refundId,
BillingItemId = item.BillingItemId,
|
bc35ccd1
“wangming”
feat: 添加退卡业务相关功能
|
2288
|
MemberId = input.FromMemberId, // 转卡时使用转出方会员ID
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2289
2290
|
CreateTime = transferTime,
CreateUser = userInfo.userId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2291
|
Px = refundPxmxEntity.Px,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2292
2293
|
Pxmc = item.ItemName,
Pxjg = item.ItemPrice,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2294
|
Tkje = totalItemDeduction,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2295
|
ProjectNumber = item.TransferQuantity,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2296
2297
|
SourceType = refundPxmxEntity.SourceType,
TotalPrice = totalItemDeduction,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2298
2299
2300
|
IsEffective = StatusEnum.有效.GetHashCode()
};
refundMxEntities.Add(refundMxEntity);
|
63df7ccb
“wangming”
1
|
2301
2302
2303
|
var refundKdyjEntities = _db.Queryable<LqKdJksyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
//保存退卡健康师业绩表
foreach (var jks in refundKdyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2304
|
{
|
63df7ccb
“wangming”
1
|
2305
2306
|
//获取健康师当月金三角id
var monthString = DateTime.Now.ToString("yyyyMM");
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2307
2308
2309
2310
2311
2312
|
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
|
2313
2314
|
//获取本月
refundJksyjEntities.Add(new LqHytkJksyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2315
|
{
|
63df7ccb
“wangming”
1
|
2316
2317
|
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
|
5dc762df
“wangming”
Enhance performan...
|
2318
|
Jks = jks.Jkszh,
|
63df7ccb
“wangming”
1
|
2319
2320
|
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2321
|
Jksyj = (totalItemDeduction / refundKdyjEntities.Count()),
|
63df7ccb
“wangming”
1
|
2322
2323
2324
2325
2326
2327
2328
2329
2330
|
Tksj = DateTime.Now,
F_jsjid = GetMonTeam.JsjId,
F_tkpxid = refundMxEntity.Id,
F_tkpxNumber = item.TransferQuantity,
F_CreateTime = transferTime,
F_CreateUser = userInfo.userId,
CardReturn = refundMxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2331
|
}
|
63df7ccb
“wangming”
1
|
2332
2333
|
//查询科技部老师的业绩
var TechTeacherEntities = _db.Queryable<LqKdKjbsyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2334
|
// 创建退卡科技部老师业绩记录
|
63df7ccb
“wangming”
1
|
2335
|
foreach (var kjbs in TechTeacherEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2336
|
{
|
63df7ccb
“wangming”
1
|
2337
|
refundKjbsyjEntities.Add(new LqHytkKjbsyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2338
|
{
|
63df7ccb
“wangming”
1
|
2339
2340
2341
2342
2343
|
Id = YitIdHelper.NextId().ToString(),
Gltkbh = refundId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2344
|
Kjblsyj = (totalItemDeduction / TechTeacherEntities.Count()),
|
63df7ccb
“wangming”
1
|
2345
2346
2347
2348
2349
2350
2351
2352
2353
|
Tksj = transferTime,
F_tkpxid = refundMxEntity.Id,
F_LaborCost = kjbs.LaborCost,
F_tkpxNumber = item.TransferQuantity,
F_CreateTime = transferTime,
F_CreateUser = userInfo.userId,
CardReturn = refundMxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
|
}
}
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...
|
2378
2379
|
Kdrq = DateTime.Now,
Gjlx = toMember.Khlx,
|
63df7ccb
“wangming”
1
|
2380
2381
|
Fkfs = "转卡",
Sfskdd = "否",
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2382
|
Zdyj = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
|
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...
|
2394
|
var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2395
2396
2397
2398
|
var billingPxmxEntity = new LqKdPxmxEntity
{
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2399
|
Px = refundPxmxEntity.Px,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2400
2401
2402
2403
2404
2405
|
Pxmc = item.ItemName,
Pxjg = item.ItemPrice,
MemberId = input.ToMemberId,
CreateTIme = transferTime,
ProjectNumber = item.TransferQuantity,
IsEnabled = StatusEnum.有效.GetHashCode(),
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2406
|
SourceType = refundPxmxEntity.SourceType,
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2407
2408
2409
2410
2411
2412
2413
|
TotalPrice = item.ItemPrice * item.TransferQuantity,
ActualPrice = item.ItemPrice * item.TransferQuantity,
IsEffective = StatusEnum.有效.GetHashCode(),
Remark = $"从会员 {fromMember.Khmc} 转入"
};
billingPxmxEntities.Add(billingPxmxEntity);
|
63df7ccb
“wangming”
1
|
2414
|
foreach (var jks in refundJksyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2415
|
{
|
63df7ccb
“wangming”
1
|
2416
|
billingJksyjEntities.Add(new LqKdJksyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2417
|
{
|
63df7ccb
“wangming”
1
|
2418
2419
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
|
5dc762df
“wangming”
Enhance performan...
|
2420
|
Jks = jks.Jkszh,
|
63df7ccb
“wangming”
1
|
2421
2422
2423
2424
2425
2426
2427
2428
|
Jksxm = jks.Jksxm,
Jkszh = jks.Jkszh,
Jksyj = jks.Jksyj.ToString(),
Yjsj = transferTime,
Jsj_id = jks.F_jsjid,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2429
2430
|
}
|
63df7ccb
“wangming”
1
|
2431
|
foreach (var kjbs in refundKjbsyjEntities)
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2432
|
{
|
63df7ccb
“wangming”
1
|
2433
|
billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2434
|
{
|
63df7ccb
“wangming”
1
|
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
|
Id = YitIdHelper.NextId().ToString(),
Glkdbh = billingId,
Kjbls = kjbs.Kjbls,
Kjblsxm = kjbs.Kjblsxm,
Kjblszh = kjbs.Kjblszh,
Kjblsyj = kjbs.Kjblsyj.ToString(),
Yjsj = transferTime,
Kdpxid = billingPxmxEntity.Id,
IsEffective = StatusEnum.有效.GetHashCode()
});
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2445
2446
|
}
}
|
5b462535
“wangming”
1111
|
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
|
//记录转卡日志
var transferLogEntity = new LqCardTransferLogEntity
{
Id = YitIdHelper.NextId().ToString(),
RefundCardId = refundId,
BillingCardId = billingId,
TransferFromMemberId = input.FromMemberId,
TransferToMemberId = input.ToMemberId,
TransferAmount = input.TransferItems.Sum(x => x.ItemPrice * x.TransferQuantity),
TransferTime = transferTime,
OperatorId = userInfo.userId,
Remarks = input.Remarks,
CreateTime = DateTime.Now,
IsEffective = StatusEnum.有效.GetHashCode()
};
await _db.Insertable(transferLogEntity).ExecuteCommandAsync();
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
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
|
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: 实现转卡接口和库存管理功能
|
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
|
#region 获取品项剩余数量
/// <summary>
/// 获取品项剩余数量
/// </summary>
/// <param name="billingItemId">开单品项明细ID</param>
/// <returns>剩余数量</returns>
private async Task<int> GetItemRemainingCount(string billingItemId)
{
try
{
// 查询购买数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2511
2512
2513
2514
|
var purchasedCount = await _db.Queryable<LqKdPxmxEntity>()
.Where(x => x.Id == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
.SumAsync(x => x.ProjectNumber);
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2515
|
// 查询消费数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2516
2517
|
var consumedCount = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => x.BillingItemId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
|
a52c7842
“wangming”
更新服务类:LqKdKdjlbSe...
|
2518
|
.SumAsync(x => x.OriginalProjectNumber);
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2519
|
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2520
|
// 查询退卡数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2521
2522
2523
2524
|
var refundedCount = await _db.Queryable<LqHytkMxEntity>()
.Where(x => x.BillingItemId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
.SumAsync(x => x.ProjectNumber);
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2525
|
// 查询储扣数量
|
e745bcc2
“wangming”
修复转卡方法中的空引用异常和Fir...
|
2526
2527
2528
2529
|
var deductCount = await _db.Queryable<LqKdDeductinfoEntity>()
.Where(x => x.DeductId == billingItemId && x.IsEffective == StatusEnum.有效.GetHashCode())
.SumAsync(x => x.ProjectNumber) ?? 0;
|
88610eda
“wangming”
feat: 实现转卡接口和库存管理功能
|
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
|
// 计算剩余数量
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
|
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
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
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
|
#region 门店整体统计表
/// <summary>
/// 门店整体统计表
/// </summary>
/// <remarks>
/// 统计每个健康师在指定时间周期内的各项数据指标
/// 包括:邀约人数、预约人数、到店人数、开单人数、开单金额、消耗金额、人头、人次、消耗项目数
///
/// 示例请求:
/// ```json
/// {
/// "startTime": "2025-10-01",
/// "endTime": "2025-10-31",
/// "departmentId": "部门ID",
/// "storeId": "门店ID",
/// "employeeName": "健康师姓名"
/// }
/// ```
///
/// 参数说明:
/// - startTime: 开始时间(可选,默认为当月1号)
/// - endTime: 结束时间(可选,默认为当前时间)
/// - departmentId: 事业部ID(可选)
/// - storeId: 门店ID(可选)
/// - employeeName: 健康师姓名(可选)
///
/// 返回字段说明:
/// - EmployeeId: 健康师ID
/// - EmployeeName: 健康师姓名
/// - StoreId: 门店ID
/// - StoreName: 门店名称
/// - DepartmentId: 事业部ID
/// - DepartmentName: 事业部名称
/// - InviteCount: 邀约人数(按客户去重)
/// - AppointmentCount: 预约人数(按客户去重,无论预约状态)
/// - VisitCount: 到店人数(按客户去重,仅统计状态为'已确认'的预约)
/// - BillingCount: 开单人数(按开单记录去重)
/// - BillingAmount: 开单金额(开单业绩总金额)
/// - ConsumeAmount: 消耗金额(消耗业绩总金额)
/// - HeadCount: 人头(按客户去重)
/// - PersonCount: 人次(按客户+日期去重,同一客户不同天算多次)
/// - ProjectCount: 消耗项目数(项目总次数)
/// </remarks>
/// <param name="input">查询参数</param>
/// <returns>健康师统计数据列表</returns>
/// <response code="200">成功返回统计数据</response>
/// <response code="400">参数错误</response>
/// <response code="500">服务器错误</response>
[HttpGet("get-health-coach-statistics")]
public async Task<dynamic> GetHealthCoachStatistics([FromQuery] HealthCoachStatisticsQueryInput input)
{
try
{
// 设置默认时间范围(如果未提供,默认为当月)
var startTime = input.StartTime ?? new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
var endTime = input.EndTime ?? DateTime.Now;
// 构建SQL查询
var sql = $@"
SELECT
u.F_Id as EmployeeId,
u.F_REALNAME as EmployeeName,
u.F_MDID as StoreId,
md.dm as StoreName,
md.syb as DepartmentId,
dept.F_FullName as DepartmentName,
-- 邀约人数
COALESCE(invite_stats.InviteCount, 0) as InviteCount,
-- 预约人数(无论状态)
COALESCE(appointment_stats.AppointmentCount, 0) as AppointmentCount,
-- 到店人数(已确认状态)
COALESCE(visit_stats.VisitCount, 0) as VisitCount,
-- 开单人数和金额
COALESCE(billing_stats.BillingCount, 0) as BillingCount,
COALESCE(billing_stats.BillingAmount, 0) as BillingAmount,
-- 消耗相关统计
COALESCE(consume_stats.ConsumeAmount, 0) as ConsumeAmount,
COALESCE(consume_stats.HeadCount, 0) as HeadCount,
COALESCE(consume_stats.PersonCount, 0) as PersonCount,
COALESCE(consume_stats.ProjectCount, 0) as ProjectCount
FROM BASE_USER u
LEFT JOIN lq_mdxx md ON u.F_MDID = md.F_Id
LEFT JOIN base_organize dept ON md.syb = dept.F_Id
-- 邀约统计子查询
LEFT JOIN (
SELECT
yyr as EmployeeId,
COUNT(DISTINCT yykh) as InviteCount
FROM lq_yaoyjl
WHERE yyr IS NOT NULL
AND F_CreateTime >= @startTime
AND F_CreateTime <= @endTime
GROUP BY yyr
) invite_stats ON u.F_Id = invite_stats.EmployeeId
-- 预约统计子查询
LEFT JOIN (
SELECT
yyr as EmployeeId,
COUNT(DISTINCT gk) as AppointmentCount
FROM lq_yyjl
WHERE yyr IS NOT NULL
AND F_CreateTime >= @startTime
AND F_CreateTime <= @endTime
GROUP BY yyr
) appointment_stats ON u.F_Id = appointment_stats.EmployeeId
-- 到店统计子查询
LEFT JOIN (
SELECT
yyr as EmployeeId,
COUNT(DISTINCT gk) as VisitCount
FROM lq_yyjl
WHERE yyr IS NOT NULL
AND F_Status = '已确认'
AND F_CreateTime >= @startTime
AND F_CreateTime <= @endTime
GROUP BY yyr
) visit_stats ON u.F_Id = visit_stats.EmployeeId
-- 开单统计子查询
LEFT JOIN (
SELECT
jkszh as EmployeeId,
COUNT(DISTINCT glkdbh) as BillingCount,
SUM(CAST(jksyj AS DECIMAL(18,2))) as BillingAmount
FROM lq_kd_jksyj
WHERE jkszh IS NOT NULL
AND F_IsEffective = 1
AND yjsj >= @startTime
AND yjsj <= @endTime
GROUP BY jkszh
) billing_stats ON u.F_Id = billing_stats.EmployeeId
-- 消耗统计子查询
LEFT JOIN (
SELECT
jksyj.jkszh as EmployeeId,
SUM(jksyj.jksyj) as ConsumeAmount,
COUNT(DISTINCT hyhk.hy) as HeadCount,
COUNT(DISTINCT CONCAT(jksyj.jkszh, '_', hyhk.hy, '_', DATE(hyhk.hksj))) as PersonCount,
SUM(jksyj.F_kdpxNumber) as ProjectCount
FROM lq_xh_jksyj jksyj
INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
WHERE jksyj.jkszh IS NOT NULL
AND jksyj.F_IsEffective = 1
AND hyhk.F_IsEffective = 1
AND hyhk.hksj >= @startTime
AND hyhk.hksj <= @endTime
GROUP BY jksyj.jkszh
) consume_stats ON u.F_Id = consume_stats.EmployeeId
WHERE u.F_GW = '健康师'
";
// 添加条件过滤
var conditions = new List<string>();
var parameters = new List<SugarParameter>
{
new SugarParameter("@startTime", startTime),
new SugarParameter("@endTime", endTime)
};
if (!string.IsNullOrEmpty(input.DepartmentId))
{
conditions.Add("md.syb = @departmentId");
parameters.Add(new SugarParameter("@departmentId", input.DepartmentId));
}
if (!string.IsNullOrEmpty(input.StoreId))
{
conditions.Add("u.F_MDID = @storeId");
parameters.Add(new SugarParameter("@storeId", input.StoreId));
}
if (!string.IsNullOrEmpty(input.EmployeeName))
{
conditions.Add("u.F_REALNAME LIKE @employeeName");
parameters.Add(new SugarParameter("@employeeName", $"%{input.EmployeeName}%"));
}
if (conditions.Any())
{
sql += " AND " + string.Join(" AND ", conditions);
}
sql += " ORDER BY u.F_REALNAME";
// 执行查询
var allData = await _db.Ado.SqlQueryAsync<HealthCoachStatisticsOutput>(sql, parameters);
// 手动分页
var totalCount = allData.Count;
var pagedData = allData
.Skip((input.currentPage - 1) * input.pageSize)
.Take(input.pageSize)
.ToList();
// 直接返回分页结果
return new
{
list = pagedData,
pagination = new
{
pageIndex = input.currentPage,
pageSize = input.pageSize,
totalCount = totalCount
}
};
}
catch (Exception ex)
{
_logger.LogError(ex, "获取健康师统计数据失败");
throw NCCException.Oh($"获取健康师统计数据失败:{ex.Message}");
}
}
#endregion
|
96009bc9
hexiaodong
hxd
|
2766
2767
|
}
}
|