c842ad9a
“wangming”
Remove analyze_ex...
|
1
2
3
4
5
6
7
8
9
10
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using NCC.ClayObject;
using NCC.Common.Configuration;
using NCC.Common.Core.Manager;
|
96009bc9
hexiaodong
hxd
|
11
12
13
|
using NCC.Common.Enum;
using NCC.Common.Extension;
using NCC.Common.Filter;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
14
15
16
|
using NCC.Common.Helper;
using NCC.Common.Model.NPOI;
using NCC.DataEncryption;
|
96009bc9
hexiaodong
hxd
|
17
18
|
using NCC.Dependency;
using NCC.DynamicApiController;
|
41da4257
“wangming”
Refactor LqEventS...
|
19
|
using NCC.Extend.Entitys.Dto.Common;
|
96009bc9
hexiaodong
hxd
|
20
|
using NCC.Extend.Entitys.Dto.LqKhxx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
21
|
using NCC.Extend.Entitys.Dto.LqXhHyhk;
|
41da4257
“wangming”
Refactor LqEventS...
|
22
|
using NCC.Extend.Entitys.Enum;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
23
24
|
using NCC.Extend.Entitys.lq_hytk_hytk;
using NCC.Extend.Entitys.lq_hytk_mx;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
25
26
|
using NCC.Extend.Entitys.lq_kd_kdjlb;
using NCC.Extend.Entitys.lq_kd_pxmx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
27
|
using NCC.Extend.Entitys.lq_khxx;
|
7f83b333
“wangming”
重构:删除部门管理模块并修复预约记录服务
|
28
|
using NCC.Extend.Entitys.lq_mdxx;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
29
30
|
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_pxmx;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
31
|
using NCC.Extend.Interfaces.LqKhxx;
|
0380c57d
“wangming”
修复项目编译错误和优化功能
|
32
|
using NCC.System.Entitys.Permission;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
33
|
using NCC.FriendlyException;
|
96009bc9
hexiaodong
hxd
|
34
|
using NCC.JsonSerialization;
|
c842ad9a
“wangming”
Remove analyze_ex...
|
35
36
|
using SqlSugar;
using Yitter.IdGenerator;
|
96009bc9
hexiaodong
hxd
|
37
38
39
40
|
namespace NCC.Extend.LqKhxx
{
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
41
|
/// 绿纤客户(会员)资料服务
|
96009bc9
hexiaodong
hxd
|
42
|
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
43
|
[ApiDescriptionSettings(Tag = "绿纤客户(会员)资料服务", Name = "LqKhxx", Order = 200)]
|
96009bc9
hexiaodong
hxd
|
44
45
46
47
48
49
|
[Route("api/Extend/[controller]")]
public class LqKhxxService : ILqKhxxService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<LqKhxxEntity> _lqKhxxRepository;
private readonly SqlSugarScope _db;
private readonly IUserManager _userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
50
|
private readonly ILogger<LqKhxxService> _logger;
|
96009bc9
hexiaodong
hxd
|
51
52
53
54
|
/// <summary>
/// 初始化一个<see cref="LqKhxxService"/>类型的新实例
/// </summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
55
|
public LqKhxxService(ISqlSugarRepository<LqKhxxEntity> lqKhxxRepository, IUserManager userManager, ILogger<LqKhxxService> logger)
|
96009bc9
hexiaodong
hxd
|
56
|
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
57
|
_lqKhxxRepository = lqKhxxRepository;
|
96009bc9
hexiaodong
hxd
|
58
59
|
_db = _lqKhxxRepository.Context;
_userManager = userManager;
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
60
|
_logger = logger;
|
96009bc9
hexiaodong
hxd
|
61
|
}
|
c842ad9a
“wangming”
Remove analyze_ex...
|
62
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
63
|
#region 客户资料
|
96009bc9
hexiaodong
hxd
|
64
65
66
67
68
69
70
71
72
73
74
75
|
/// <summary>
/// 获取客户资料
/// </summary>
/// <param name="id">参数</param>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<dynamic> GetInfo(string id)
{
var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
var output = entity.Adapt<LqKhxxInfoOutput>();
return output;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
76
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
77
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
78
|
#region 客户资料列表
|
96009bc9
hexiaodong
hxd
|
79
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
80
81
82
83
|
/// 获取客户资料列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
84
85
86
87
|
[HttpGet("")]
public async Task<dynamic> GetList([FromQuery] LqKhxxListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
96009bc9
hexiaodong
hxd
|
88
|
var data = await _db.Queryable<LqKhxxEntity>()
|
dac8767e
“wangming”
111111111
|
89
|
.WhereIF(!string.IsNullOrEmpty(input.keyWord), p => p.Khmc.Contains(input.keyWord) || p.Sjh.Contains(input.keyWord) || p.Dah.Contains(input.keyWord))
|
96009bc9
hexiaodong
hxd
|
90
91
92
93
94
95
96
97
|
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
.WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
.WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
.WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
.WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
.WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
.WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
|
96009bc9
hexiaodong
hxd
|
98
|
.WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
|
96009bc9
hexiaodong
hxd
|
99
100
101
102
103
104
105
106
107
108
|
.WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
.WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
.WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
.WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
.WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
.WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
.WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
.WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
.WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
.WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
|
96009bc9
hexiaodong
hxd
|
109
|
.WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
110
|
.Select(it => new LqKhxxListOutput
|
96009bc9
hexiaodong
hxd
|
111
112
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
113
114
115
116
117
118
119
|
khmc = it.Khmc,
sjh = it.Sjh,
dah = it.Dah,
xb = it.Xb,
gzhzt = it.Gzhzt,
wxnc = it.Wxnc,
wxxcxzt = it.Wxxcxzt,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
120
|
gsmd = it.Gsmd,
|
7f83b333
“wangming”
重构:删除部门管理模块并修复预约记录服务
|
121
|
gsmdName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == it.Gsmd).Select(u => u.Dm),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
122
123
124
125
126
127
128
129
|
zcsj = it.Zcsj,
khlx = it.Khlx,
khjd = it.Khjd,
khxf = it.Khxf,
xfpc = it.Xfpc,
tjr = it.Tjr,
fzgw = it.Fzgw,
mrs = it.Mrs,
|
0380c57d
“wangming”
修复项目编译错误和优化功能
|
130
|
mrsName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Mrs).Select(u => u.RealName),
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
131
132
133
|
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
134
135
136
|
yanglsr = it.Yanglsr,
yinlsr = it.Yinlsr,
ml = it.Ml,
|
c6d1116d
“wangming”
修复了查询接口报错的问题
|
137
|
createTime = it.CreateTime,
|
c842ad9a
“wangming”
Remove analyze_ex...
|
138
139
140
141
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
142
|
return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
|
96009bc9
hexiaodong
hxd
|
143
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
144
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
145
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
146
|
#region 新建客户资料
|
96009bc9
hexiaodong
hxd
|
147
148
149
150
151
152
153
154
155
|
/// <summary>
/// 新建客户资料
/// </summary>
/// <param name="input">参数</param>
/// <returns></returns>
[HttpPost("")]
public async Task Create([FromBody] LqKhxxCrInput input)
{
var userInfo = await _userManager.GetUserInfo();
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
156
157
158
159
160
161
|
//判断手机号是否存在
var user = _db.Queryable<LqKhxxEntity>().Where(u => u.Sjh == input.sjh).Any();
if (user)
{
throw NCCException.Oh("该会员已存在");
}
|
96009bc9
hexiaodong
hxd
|
162
163
|
var entity = input.Adapt<LqKhxxEntity>();
entity.Id = YitIdHelper.NextId().ToString();
|
bff07b1f
“wangming”
Refactor FileVari...
|
164
165
166
167
168
169
|
// 处理客户消费字段:将数组转换为逗号分隔的字符串
if (input.khxf != null && input.khxf.Count > 0)
{
entity.Khxf = string.Join(",", input.khxf);
}
|
96009bc9
hexiaodong
hxd
|
170
|
var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
|
c842ad9a
“wangming”
Remove analyze_ex...
|
171
172
|
if (!(isOk > 0))
throw NCCException.Oh(ErrorCode.COM1000);
|
96009bc9
hexiaodong
hxd
|
173
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
174
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
175
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
176
|
#region 获取客户资料无分页列表
|
96009bc9
hexiaodong
hxd
|
177
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
178
179
180
181
|
/// 获取客户资料无分页列表
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
182
183
184
185
|
[NonAction]
public async Task<dynamic> GetNoPagingList([FromQuery] LqKhxxListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
96009bc9
hexiaodong
hxd
|
186
187
188
|
List<string> queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject<List<string>>() : null;
DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null;
DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null;
|
96009bc9
hexiaodong
hxd
|
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
var data = await _db.Queryable<LqKhxxEntity>()
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
.WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
.WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
.WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
.WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
.WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
.WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
|
96009bc9
hexiaodong
hxd
|
204
205
206
207
208
209
210
211
212
213
214
215
216
|
.WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
.WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
.WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
.WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
.WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Equals(input.khxf))
.WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
.WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
.WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
.WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
.WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
.WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
.WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
|
96009bc9
hexiaodong
hxd
|
217
218
219
220
221
|
.WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
.WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
.WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
.WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
222
|
.Select(it => new LqKhxxListOutput
|
96009bc9
hexiaodong
hxd
|
223
224
|
{
id = it.Id,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
225
226
227
228
229
230
231
232
|
khmc = it.Khmc,
sjh = it.Sjh,
dah = it.Dah,
xb = it.Xb,
gzhzt = it.Gzhzt,
wxnc = it.Wxnc,
wxxcxzt = it.Wxxcxzt,
zjdlsj = it.Zjdlsj,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
233
234
235
236
237
238
239
240
241
242
243
244
|
gsmd = it.Gsmd,
zcsj = it.Zcsj,
khlx = it.Khlx,
khjd = it.Khjd,
khxf = it.Khxf,
xfpc = it.Xfpc,
tjr = it.Tjr,
fzgw = it.Fzgw,
mrs = it.Mrs,
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
245
246
247
|
yanglsr = it.Yanglsr,
yinlsr = it.Yinlsr,
ml = it.Ml,
|
c6d1116d
“wangming”
修复了查询接口报错的问题
|
248
|
createTime = it.CreateTime,
|
c842ad9a
“wangming”
Remove analyze_ex...
|
249
250
251
252
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToListAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
253
|
return data;
|
96009bc9
hexiaodong
hxd
|
254
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
255
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
256
|
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
257
258
259
260
261
262
263
264
265
266
|
#region 获取线索池客户列表
/// <summary>
/// 获取线索池客户列表
/// </summary>
/// <param name="input">查询参数</param>
/// <returns>线索池客户列表</returns>
[HttpGet("leads-pool")]
public async Task<PageResult<LqKhxxListOutput>> GetLeadsPoolList([FromQuery] LqKhxxListQueryInput input)
{
var sidx = input.sidx == null ? "id" : input.sidx;
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
267
268
269
270
271
272
273
274
275
276
277
|
List<string> queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject<List<string>>() : null;
DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null;
DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null;
List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
var data = await _db.Queryable<LqKhxxEntity>()
|
41da4257
“wangming”
Refactor LqEventS...
|
278
|
.Where(p => p.Khlx == "线索") // 固定查询线索池客户
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
279
280
281
282
283
284
285
286
|
.WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
.WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
.WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
.WhereIF(!string.IsNullOrEmpty(input.dah), p => p.Dah.Contains(input.dah))
.WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
.WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
.WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
.WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
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
|
.WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
.WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
.WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
.WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
.WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
.WhereIF(!string.IsNullOrEmpty(input.xfpc), p => p.Xfpc.Equals(input.xfpc))
.WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
.WhereIF(!string.IsNullOrEmpty(input.fzgw), p => p.Fzgw.Contains(input.fzgw))
.WhereIF(!string.IsNullOrEmpty(input.mrs), p => p.Mrs.Contains(input.mrs))
.WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
.WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
.WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
.WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
.WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
.WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
.WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
.WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
.Select(it => new LqKhxxListOutput
{
id = it.Id,
khmc = it.Khmc,
sjh = it.Sjh,
dah = it.Dah,
xb = it.Xb,
gzhzt = it.Gzhzt,
wxnc = it.Wxnc,
wxxcxzt = it.Wxxcxzt,
zjdlsj = it.Zjdlsj,
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
|
gsmd = it.Gsmd,
zcsj = it.Zcsj,
khlx = it.Khlx,
khjd = it.Khjd,
khxf = it.Khxf,
xfpc = it.Xfpc,
tjr = it.Tjr,
fzgw = it.Fzgw,
mrs = it.Mrs,
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
yanglsr = it.Yanglsr,
yinlsr = it.Yinlsr,
ml = it.Ml,
|
c6d1116d
“wangming”
修复了查询接口报错的问题
|
331
|
createTime = it.CreateTime,
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
332
333
334
335
336
337
338
339
|
})
.MergeTable()
.OrderBy(sidx + " " + input.sort)
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
}
#endregion
|
850bf205
“wangming”
Add ActualPrice f...
|
340
|
#region 获取客户订单类型(首单/升单)
|
920afb29
“wangming”
修改了一摩尔的东西,我一个人在客户...
|
341
342
343
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
372
373
374
375
376
377
|
/// <summary>
/// 获取客户订单类型(首单/升单)
/// </summary>
/// <param name="customerId">客户ID</param>
/// <returns>客户订单类型信息</returns>
[HttpGet("order-type/{customerId}")]
public async Task<LqKhxxOrderTypeOutput> GetCustomerOrderType(string customerId)
{
if (string.IsNullOrEmpty(customerId))
{
throw NCCException.Oh("客户ID不能为空");
}
// 查询客户是否存在
var customerExists = await _db.Queryable<LqKhxxEntity>().Where(c => c.Id == customerId).AnyAsync();
if (!customerExists)
{
throw NCCException.Oh("客户不存在");
}
// 查询开单记录数量
var orderCount = await _db.Queryable<LqKdKdjlbEntity>().Where(o => o.Kdhy == customerId).CountAsync();
var hasOrderRecord = orderCount > 0;
var orderType = hasOrderRecord ? "repeat_order" : "first_order";
return new LqKhxxOrderTypeOutput
{
CustomerId = customerId,
OrderType = orderType,
HasOrderRecord = hasOrderRecord,
OrderCount = orderCount,
};
}
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
378
|
#region 导出客户资料
|
96009bc9
hexiaodong
hxd
|
379
|
/// <summary>
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
380
381
382
383
|
/// 导出客户资料
/// </summary>
/// <param name="input">请求参数</param>
/// <returns></returns>
|
96009bc9
hexiaodong
hxd
|
384
385
386
387
388
389
390
391
392
393
394
395
396
397
|
[HttpGet("Actions/Export")]
public async Task<dynamic> Export([FromQuery] LqKhxxListQueryInput input)
{
var userInfo = await _userManager.GetUserInfo();
var exportData = new List<LqKhxxListOutput>();
if (input.dataType == 0)
{
var data = Clay.Object(await this.GetList(input));
exportData = data.Solidify<PageResult<LqKhxxListOutput>>().list;
}
else
{
exportData = await this.GetNoPagingList(input);
}
|
c842ad9a
“wangming”
Remove analyze_ex...
|
398
399
|
List<ParamsModel> paramList =
"[{\"value\":\"客户编码\",\"field\":\"id\"},{\"value\":\"客户名称\",\"field\":\"khmc\"},{\"value\":\"手机号\",\"field\":\"sjh\"},{\"value\":\"档案号\",\"field\":\"dah\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"公众号状态\",\"field\":\"gzhzt\"},{\"value\":\"微信昵称\",\"field\":\"wxnc\"},{\"value\":\"小程序状态\",\"field\":\"wxxcxzt\"},{\"value\":\"最近登录时间\",\"field\":\"zjdlsj\"},{\"value\":\"客户目前归属\",\"field\":\"khmqgs\"},{\"value\":\"归属门店\",\"field\":\"gsmd\"},{\"value\":\"注册时间\",\"field\":\"zcsj\"},{\"value\":\"客户类型\",\"field\":\"khlx\"},{\"value\":\"客户阶段\",\"field\":\"khjd\"},{\"value\":\"客户消费\",\"field\":\"khxf\"},{\"value\":\"消费频次\",\"field\":\"xfpc\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"负责顾问\",\"field\":\"fzgw\"},{\"value\":\"美容师\",\"field\":\"mrs\"},{\"value\":\"进店渠道\",\"field\":\"jdqd\"},{\"value\":\"联系地址\",\"field\":\"lxdz\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"阳历生日\",\"field\":\"yanglsr\"},{\"value\":\"阴历生日\",\"field\":\"yinlsr\"},{\"value\":\"年龄\",\"field\":\"ml\"},]".ToList<ParamsModel>();
|
96009bc9
hexiaodong
hxd
|
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
|
ExcelConfig excelconfig = new ExcelConfig();
excelconfig.FileName = "客户资料.xls";
excelconfig.HeadFont = "微软雅黑";
excelconfig.HeadPoint = 10;
excelconfig.IsAllSizeColumn = true;
excelconfig.ColumnModel = new List<ExcelColumnModel>();
List<string> selectKeyList = input.selectKey.Split(',').ToList();
foreach (var item in selectKeyList)
{
var isExist = paramList.Find(p => p.field == item);
if (isExist != null)
{
excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
}
}
var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
ExcelExportHelper<LqKhxxListOutput>.Export(exportData, excelconfig, addPath);
var fileName = _userManager.UserId + "|" + addPath + "|xls";
|
c842ad9a
“wangming”
Remove analyze_ex...
|
418
|
var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
|
96009bc9
hexiaodong
hxd
|
419
420
|
return output;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
421
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
422
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
423
|
#region 批量删除客户资料
|
96009bc9
hexiaodong
hxd
|
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
|
/// <summary>
/// 批量删除客户资料
/// </summary>
/// <param name="ids">主键数组</param>
/// <returns></returns>
[HttpPost("batchRemove")]
public async Task BatchRemove([FromBody] List<string> ids)
{
var entitys = await _db.Queryable<LqKhxxEntity>().In(it => it.Id, ids).ToListAsync();
if (entitys.Count > 0)
{
try
{
//开启事务
_db.BeginTran();
//批量删除客户资料
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
440
|
await _db.Deleteable<LqKhxxEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
|
96009bc9
hexiaodong
hxd
|
441
442
443
444
445
446
447
448
449
450
451
|
//关闭事务
_db.CommitTran();
}
catch (Exception)
{
//回滚事务
_db.RollbackTran();
throw NCCException.Oh(ErrorCode.COM1002);
}
}
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
452
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
453
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
454
|
#region 更新客户资料
|
96009bc9
hexiaodong
hxd
|
455
456
457
458
459
460
461
462
463
464
|
/// <summary>
/// 更新客户资料
/// </summary>
/// <param name="id">主键</param>
/// <param name="input">参数</param>
/// <returns></returns>
[HttpPut("{id}")]
public async Task Update(string id, [FromBody] LqKhxxUpInput input)
{
var entity = input.Adapt<LqKhxxEntity>();
|
bff07b1f
“wangming”
Refactor FileVari...
|
465
466
467
468
469
470
471
|
// 处理客户消费字段:将数组转换为逗号分隔的字符串
if (input.khxf != null && input.khxf.Count > 0)
{
entity.Khxf = string.Join(",", input.khxf);
}
|
96009bc9
hexiaodong
hxd
|
472
|
var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
|
c842ad9a
“wangming”
Remove analyze_ex...
|
473
474
|
if (!(isOk > 0))
throw NCCException.Oh(ErrorCode.COM1001);
|
96009bc9
hexiaodong
hxd
|
475
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
476
|
#endregion
|
c842ad9a
“wangming”
Remove analyze_ex...
|
477
|
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
478
|
#region 删除客户资料
|
96009bc9
hexiaodong
hxd
|
479
480
481
482
483
484
485
486
487
488
|
/// <summary>
/// 删除客户资料
/// </summary>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task Delete(string id)
{
var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
_ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
var isOk = await _db.Deleteable<LqKhxxEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
|
c842ad9a
“wangming”
Remove analyze_ex...
|
489
490
|
if (!(isOk > 0))
throw NCCException.Oh(ErrorCode.COM1002);
|
96009bc9
hexiaodong
hxd
|
491
|
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
492
493
494
495
496
497
498
499
500
|
#endregion
#region 查询会员剩余品项
/// <summary>
/// 查询会员剩余品项信息
/// </summary>
/// <remarks>
/// 根据会员ID查询该会员的剩余品项信息,包括已购买但未消费完的品项详情
/// 支持按来源类型(F_SourceType)区分相同品项的不同来源,确保数据准确分组
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
501
|
/// 计算逻辑:剩余数量 = 购买数量 - 消费数量 - 退卡数量
|
c842ad9a
“wangming”
Remove analyze_ex...
|
502
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
503
504
505
506
|
/// 示例请求:
/// ```json
/// GET /api/Extend/LqKhxx/GetMemberRemainingItems?memberId=GK2025022100004
/// ```
|
c842ad9a
“wangming”
Remove analyze_ex...
|
507
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
508
509
|
/// 参数说明:
/// - memberId: 会员ID,必填参数
|
c842ad9a
“wangming”
Remove analyze_ex...
|
510
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
511
512
513
514
515
516
517
518
519
520
|
/// 返回数据结构:
/// - MemberId: 会员ID
/// - MemberName: 会员姓名
/// - RemainingItems: 剩余品项列表
/// - ItemId: 品项ID
/// - ItemName: 品项名称
/// - ItemPrice: 品项单价
/// - SourceType: 来源类型(用于区分相同品项的不同来源)
/// - TotalPurchased: 总购买数量
/// - ConsumedCount: 已消费数量
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
521
|
/// - RefundedCount: 已退卡数量
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
522
|
/// - RemainingCount: 剩余数量
|
c842ad9a
“wangming”
Remove analyze_ex...
|
523
|
///
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
524
525
|
/// 特殊说明:
/// - 相同品项但不同SourceType的记录会分开显示
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
526
|
/// - 耗卡和退卡统计会按品项ID和SourceType精确匹配
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
527
|
/// - 确保数据按SourceType正确分组且不重叠
|
2b23ca5e
“wangming”
更新退卡相关功能,重构退卡信息表及...
|
528
|
/// - 退卡记录会减少剩余品项数量
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
529
530
531
532
533
534
535
536
537
538
539
540
541
|
/// </remarks>
/// <param name="memberId">会员ID</param>
/// <returns>会员剩余品项信息</returns>
/// <response code="200">成功返回会员剩余品项信息</response>
/// <response code="400">参数错误,会员ID不能为空</response>
/// <response code="500">服务器错误或会员不存在</response>
[HttpGet("GetMemberRemainingItems")]
public async Task<MemberRemainingItemsOutput> GetMemberRemainingItems(string memberId)
{
if (string.IsNullOrEmpty(memberId))
{
throw NCCException.Oh(ErrorCode.COM1000, "会员ID不能为空");
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
542
543
|
try
{
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
544
|
// 1. 查询会员基本信息
|
c842ad9a
“wangming”
Remove analyze_ex...
|
545
|
var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(x => x.Id == memberId).FirstAsync();
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
546
547
548
|
if (memberInfo == null)
{
_logger.LogWarning("会员不存在,会员ID:{MemberId}", memberId);
|
b45d55f7
“wangming”
Refactor LqEventS...
|
549
|
throw NCCException.Oh("会员不存在");
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
550
|
}
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
551
552
553
|
// 2. 分步查询,避免子查询问题
// 先查询基础品项数据
var baseItems = await _db.Queryable<LqKdPxmxEntity>()
|
b45d55f7
“wangming”
Refactor LqEventS...
|
554
|
.Where(x => x.MemberId == memberId)
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
555
|
.Select(x => new
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
556
|
{
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
557
558
559
560
561
562
|
x.Id,
x.Px,
x.Pxmc,
x.Pxjg,
x.SourceType,
x.ProjectNumber
|
41da4257
“wangming”
Refactor LqEventS...
|
563
|
})
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
|
.ToListAsync();
// 查询消费数据
var consumedData = await _db.Queryable<LqXhPxmxEntity>()
.Where(x => baseItems.Select(b => b.Id).Contains(x.BillingItemId))
.GroupBy(x => x.BillingItemId)
.Select(x => new
{
BillingItemId = x.BillingItemId,
TotalConsumed = SqlFunc.AggregateSum(x.ProjectNumber)
})
.ToListAsync();
// 查询退卡数据
var refundedData = await _db.Queryable<LqHytkMxEntity>()
.Where(x => baseItems.Select(b => b.Id).Contains(x.BillingItemId))
.GroupBy(x => x.BillingItemId)
.Select(x => new
|
41da4257
“wangming”
Refactor LqEventS...
|
582
|
{
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
583
584
|
BillingItemId = x.BillingItemId,
TotalRefunded = SqlFunc.AggregateSum(x.ProjectNumber)
|
b45d55f7
“wangming”
Refactor LqEventS...
|
585
586
|
})
.ToListAsync();
|
3b8e2c66
“wangming”
修复GetMemberRemain...
|
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
|
// 组装结果
var remainingItems = baseItems.Select(item => new RemainingItemInfo
{
BillingItemId = item.Id,
ItemId = item.Px,
ItemName = item.Pxmc,
ItemPrice = item.Pxjg,
SourceType = item.SourceType,
TotalPurchased = item.ProjectNumber,
ConsumedCount = consumedData.FirstOrDefault(c => c.BillingItemId == item.Id)?.TotalConsumed ?? 0,
RefundedCount = refundedData.FirstOrDefault(r => r.BillingItemId == item.Id)?.TotalRefunded ?? 0,
}).ToList();
// 计算剩余数量
foreach (var item in remainingItems)
{
item.RemainingCount = item.TotalPurchased - item.ConsumedCount - item.RefundedCount;
}
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
606
607
608
609
|
return new MemberRemainingItemsOutput
{
MemberId = memberId,
MemberName = memberInfo.Khmc,
|
c842ad9a
“wangming”
Remove analyze_ex...
|
610
|
RemainingItems = remainingItems,
|
35bb18d3
“wangming”
更新多个.DS_Store文件,删...
|
611
612
613
614
615
616
617
618
619
|
};
}
catch (Exception ex)
{
_logger.LogError(ex, "查询会员剩余品项失败,会员ID:{MemberId}", memberId);
throw NCCException.Oh(ErrorCode.COM1005, "查询会员剩余品项失败");
}
}
#endregion
|
41da4257
“wangming”
Refactor LqEventS...
|
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
|
#region 获取会员类型枚举内容
/// <summary>
/// 获取会员类型枚举内容
/// </summary>
/// <returns>扣款类型枚举列表</returns>
[HttpGet("deduct-types")]
public List<EnumOutput> GetDeductTypes()
{
return Enum.GetValues<MemberTypeEnum>()
.Select(e => new EnumOutput
{
Value = (int)e,
Name = e.ToString(),
Description = e.GetDescription(),
})
.ToList();
}
#endregion
|
96009bc9
hexiaodong
hxd
|
640
641
|
}
}
|