antissoft / lvqianmeiye_ERP

Commit 278810cb65749edcb1c37af771bc2d6049a8df5c

Authored by “wangming”
1 parent 77fe03a4

refactor: 统一代码风格和修复小问题 

- 调整LqJdqdService.cs中的代码格式，确保一致性
- 修改LqKdDeductinfo相关DTO中的DeductType字段类型，从int?改为string
- 优化LqKdKdjlbStringGenerator.cs中的字符串拼接格式
Inline Side-by-side
Showing 5 changed files with 15 additions and 23 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs
  View file @278810c
... ... @@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
15 15 /// <summary>
16 16 /// 扣减类型
17 17 /// </summary>
18   - public int? DeductType { get; set; }
  18 + public string DeductType { get; set; }
19 19  
20 20 /// <summary>
21 21 /// 扣减类型名称
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs
  View file @278810c
... ... @@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
15 15 /// <summary>
16 16 /// 扣减类型
17 17 /// </summary>
18   - public int? DeductType { get; set; }
  18 + public string DeductType { get; set; }
19 19  
20 20 /// <summary>
21 21 /// 扣减类型名称
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs
  View file @278810c
... ... @@ -10,7 +10,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
10 10 /// <summary>
11 11 /// 扣减类型
12 12 /// </summary>
13   - public int? DeductType { get; set; }
  13 + public string DeductType { get; set; }
14 14  
15 15 /// <summary>
16 16 /// 扣减关联ID
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqJdqdService.cs
  View file @278810c
... ... @@ -28,7 +28,7 @@ namespace NCC.Extend.LqJdqd
28 28 /// <summary>
29 29 /// 进店渠道服务
30 30 /// </summary>
31   - [ApiDescriptionSettings(Tag = "Extend",Name = "LqJdqd", Order = 200)]
  31 + [ApiDescriptionSettings(Tag = "Extend", Name = "LqJdqd", Order = 200)]
32 32 [Route("api/Extend/[controller]")]
33 33 public class LqJdqdService : ILqJdqdService, IDynamicApiController, ITransient
34 34 {
... ... @@ -43,7 +43,7 @@ namespace NCC.Extend.LqJdqd
43 43 ISqlSugarRepository<LqJdqdEntity> lqJdqdRepository,
44 44 IUserManager userManager)
45 45 {
46   - _lqJdqdRepository = lqJdqdRepository;
  46 + _lqJdqdRepository = lqJdqdRepository;
47 47 _db = _lqJdqdRepository.Context;
48 48 _userManager = userManager;
49 49 }
... ... @@ -73,12 +73,12 @@ namespace NCC.Extend.LqJdqd
73 73 var data = await _db.Queryable<LqJdqdEntity>()
74 74 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
75 75 .WhereIF(!string.IsNullOrEmpty(input.qdmc), p => p.Qdmc.Contains(input.qdmc))
76   - .Select(it=> new LqJdqdListOutput
  76 + .Select(it => new LqJdqdListOutput
77 77 {
78 78 id = it.Id,
79   - qdmc=it.Qdmc,
80   - }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
81   - return PageResult<LqJdqdListOutput>.SqlSugarPageResult(data);
  79 + qdmc = it.Qdmc,
  80 + }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
  81 + return PageResult<LqJdqdListOutput>.SqlSugarPageResult(data);
82 82 }
83 83  
84 84 /// <summary>
... ... @@ -108,12 +108,12 @@ namespace NCC.Extend.LqJdqd
108 108 var data = await _db.Queryable<LqJdqdEntity>()
109 109 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
110 110 .WhereIF(!string.IsNullOrEmpty(input.qdmc), p => p.Qdmc.Contains(input.qdmc))
111   - .Select(it=> new LqJdqdListOutput
  111 + .Select(it => new LqJdqdListOutput
112 112 {
113 113 id = it.Id,
114   - qdmc=it.Qdmc,
115   - }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
116   - return data;
  114 + qdmc = it.Qdmc,
  115 + }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
  116 + return data;
117 117 }
118 118  
119 119 /// <summary>
... ... @@ -135,7 +135,7 @@ namespace NCC.Extend.LqJdqd
135 135 {
136 136 exportData = await this.GetNoPagingList(input);
137 137 }
138   - List<ParamsModel> paramList = "[{\"value\":\"渠道编号\",\"field\":\"id\"},{\"value\":\"渠道名称\",\"field\":\"qdmc\"},]".ToList<ParamsModel>();
  138 + List<ParamsModel> paramList = "[{\"value\":\"渠道编号\",\"field\":\"id\"},{\"value\":\"渠道名称\",\"field\":\"qdmc\"},]".ToList<ParamsModel>();
139 139 ExcelConfig excelconfig = new ExcelConfig();
140 140 excelconfig.FileName = "进店渠道.xls";
141 141 excelconfig.HeadFont = "微软雅黑";
... ... @@ -178,7 +178,7 @@ namespace NCC.Extend.LqJdqd
178 178 //开启事务
179 179 _db.BeginTran();
180 180 //批量删除进店渠道
181   - await _db.Deleteable<LqJdqdEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
  181 + await _db.Deleteable<LqJdqdEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
182 182 //关闭事务
183 183 _db.CommitTran();
184 184 }
... ...
netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
  View file @278810c
... ... @@ -51,29 +51,21 @@ namespace NCC.Extend.Utils
51 51  
52 52 // 活动方案：532工程
53 53 sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}");
54   -
55 54 // 跟单配合：王经理 竹主任 陈思思老师
56 55 var techTeachers = GetTechTeachers(entity.lqKdKjbsyjList);
57 56 sb.AppendLine($"⏩跟单配合：{techTeachers}");
58   -
59 57 // 业绩：4800
60 58 sb.AppendLine($"⏩业绩：{entity.zdyj}");
61   -
62 59 // 实付：4800
63 60 sb.AppendLine($"⏩实付：{entity.sfyj}");
64   -
65 61 // 欠款:
66 62 sb.AppendLine($"⏩欠款: {entity.qk}");
67   -
68 63 // 抵扣：
69 64 sb.AppendLine($"⏩抵扣：{entity.deductAmount}");
70   -
71 65 // 来源：售后
72 66 sb.AppendLine($"⏩来源：{entity.khly ?? "无"}");
73   -
74 67 // 是否属于升单：
75 68 sb.AppendLine($"⏩是否属于升单：{entity.sfskdd ?? "无"}");
76   -
77 69 // 简介：高姐是我们的老客，今天邀约到犀浦店做532，维维全程陪同，陈思思老师在操作过程中给姐姐分享企业文化，找到顾客需求、邀请王经理 竹主任 给到顾客福利、顾客爽快成交，私密档案已了解到70%，感谢顾客的信任与支持 ，王经理 竹主任 陈老师辛苦了[玫瑰]维维真棒[强]龙城国际店加油！我们还在努力中！家人们给我们打气加油👏👏👏👏等待我们的捷报👍👍
78 70 sb.AppendLine($"⏩简介：{entity.jj ?? "无"}");
79 71  
... ...