diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs index 2caf217..2863795 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs @@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// /// 扣减类型 /// - public int? DeductType { get; set; } + public string DeductType { get; set; } /// /// 扣减类型名称 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs index 64e03c5..bce12b3 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs @@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// /// 扣减类型 /// - public int? DeductType { get; set; } + public string DeductType { get; set; } /// /// 扣减类型名称 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs index 9126ec9..9f9dc60 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs @@ -10,7 +10,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo /// /// 扣减类型 /// - public int? DeductType { get; set; } + public string DeductType { get; set; } /// /// 扣减关联ID diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqJdqdService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqJdqdService.cs index ca2428f..7f6b1cb 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqJdqdService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqJdqdService.cs @@ -28,7 +28,7 @@ namespace NCC.Extend.LqJdqd /// /// 进店渠道服务 /// - [ApiDescriptionSettings(Tag = "Extend",Name = "LqJdqd", Order = 200)] + [ApiDescriptionSettings(Tag = "Extend", Name = "LqJdqd", Order = 200)] [Route("api/Extend/[controller]")] public class LqJdqdService : ILqJdqdService, IDynamicApiController, ITransient { @@ -43,7 +43,7 @@ namespace NCC.Extend.LqJdqd ISqlSugarRepository lqJdqdRepository, IUserManager userManager) { - _lqJdqdRepository = lqJdqdRepository; + _lqJdqdRepository = lqJdqdRepository; _db = _lqJdqdRepository.Context; _userManager = userManager; } @@ -73,12 +73,12 @@ namespace NCC.Extend.LqJdqd var data = await _db.Queryable() .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id)) .WhereIF(!string.IsNullOrEmpty(input.qdmc), p => p.Qdmc.Contains(input.qdmc)) - .Select(it=> new LqJdqdListOutput + .Select(it => new LqJdqdListOutput { id = it.Id, - qdmc=it.Qdmc, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); + qdmc = it.Qdmc, + }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(data); } /// @@ -108,12 +108,12 @@ namespace NCC.Extend.LqJdqd var data = await _db.Queryable() .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id)) .WhereIF(!string.IsNullOrEmpty(input.qdmc), p => p.Qdmc.Contains(input.qdmc)) - .Select(it=> new LqJdqdListOutput + .Select(it => new LqJdqdListOutput { id = it.Id, - qdmc=it.Qdmc, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync(); - return data; + qdmc = it.Qdmc, + }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync(); + return data; } /// @@ -135,7 +135,7 @@ namespace NCC.Extend.LqJdqd { exportData = await this.GetNoPagingList(input); } - List paramList = "[{\"value\":\"渠道编号\",\"field\":\"id\"},{\"value\":\"渠道名称\",\"field\":\"qdmc\"},]".ToList(); + List paramList = "[{\"value\":\"渠道编号\",\"field\":\"id\"},{\"value\":\"渠道名称\",\"field\":\"qdmc\"},]".ToList(); ExcelConfig excelconfig = new ExcelConfig(); excelconfig.FileName = "进店渠道.xls"; excelconfig.HeadFont = "微软雅黑"; @@ -178,7 +178,7 @@ namespace NCC.Extend.LqJdqd //开启事务 _db.BeginTran(); //批量删除进店渠道 - await _db.Deleteable().In(d => d.Id,ids).ExecuteCommandAsync(); + await _db.Deleteable().In(d => d.Id, ids).ExecuteCommandAsync(); //关闭事务 _db.CommitTran(); } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs index c8a50cd..876fff8 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs @@ -51,29 +51,21 @@ namespace NCC.Extend.Utils // 活动方案：532工程 sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}"); - // 跟单配合：王经理 竹主任 陈思思老师 var techTeachers = GetTechTeachers(entity.lqKdKjbsyjList); sb.AppendLine($"⏩跟单配合：{techTeachers}"); - // 业绩：4800 sb.AppendLine($"⏩业绩：{entity.zdyj}"); - // 实付：4800 sb.AppendLine($"⏩实付：{entity.sfyj}"); - // 欠款: sb.AppendLine($"⏩欠款: {entity.qk}"); - // 抵扣： sb.AppendLine($"⏩抵扣：{entity.deductAmount}"); - // 来源：售后 sb.AppendLine($"⏩来源：{entity.khly ?? "无"}"); - // 是否属于升单： sb.AppendLine($"⏩是否属于升单：{entity.sfskdd ?? "无"}"); - // 简介：高姐是我们的老客，今天邀约到犀浦店做532，维维全程陪同，陈思思老师在操作过程中给姐姐分享企业文化，找到顾客需求、邀请王经理 竹主任 给到顾客福利、顾客爽快成交，私密档案已了解到70%，感谢顾客的信任与支持 ，王经理 竹主任 陈老师辛苦了[玫瑰]维维真棒[强]龙城国际店加油！我们还在努力中！家人们给我们打气加油👏👏👏👏等待我们的捷报👍👍 sb.AppendLine($"⏩简介：{entity.jj ?? "无"}");