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

- 调整LqJdqdService.cs中的代码格式，确保一致性 - 修改LqKdDeductinfo相关DTO中的DeductType字段类型，从int?改为string - 优化LqKdKdjlbStringGenerator.cs中的字符串拼接格式

refactor: 统一代码风格和修复小问题
- 调整LqJdqdService.cs中的代码格式，确保一致性 - 修改LqKdDeductinfo相关DTO中的DeductType字段类型，从int?改为string - 优化LqKdKdjlbStringGenerator.cs中的字符串拼接格式
“wangming”
1 parent 77fe03a4
Showing 5 changed files with 15 additions and 23 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend/LqJdqdService.cs
netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
@@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// <summary>
         /// 扣减类型
         /// </summary>
-        public int? DeductType { get; set; }
+        public string DeductType { get; set; }
         /// <summary>
         /// 扣减类型名称
@@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// <summary>
         /// 扣减类型
         /// </summary>
-        public int? DeductType { get; set; }
+        public string DeductType { get; set; }
         /// <summary>
         /// 扣减类型名称
@@ -10,7 +10,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// <summary>
         /// 扣减类型
         /// </summary>
-        public int? DeductType { get; set; }
+        public string DeductType { get; set; }
         /// <summary>
         /// 扣减关联ID
@@ -28,7 +28,7 @@ namespace NCC.Extend.LqJdqd
     /// <summary>
     /// 进店渠道服务
     /// </summary>
-    [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<LqJdqdEntity> 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<LqJdqdEntity>()
                 .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<LqJdqdListOutput>.SqlSugarPageResult(data);
+                    qdmc = it.Qdmc,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<LqJdqdListOutput>.SqlSugarPageResult(data);
         }
         /// <summary>
@@ -108,12 +108,12 @@ namespace NCC.Extend.LqJdqd
             var data = await _db.Queryable<LqJdqdEntity>()
                 .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;
         }
         /// <summary>
@@ -135,7 +135,7 @@ namespace NCC.Extend.LqJdqd
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"渠道编号\",\"field\":\"id\"},{\"value\":\"渠道名称\",\"field\":\"qdmc\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"渠道编号\",\"field\":\"id\"},{\"value\":\"渠道名称\",\"field\":\"qdmc\"},]".ToList<ParamsModel>();
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "进店渠道.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -178,7 +178,7 @@ namespace NCC.Extend.LqJdqd
                     //开启事务
                     _db.BeginTran();
                     //批量删除进店渠道
-                    await _db.Deleteable<LqJdqdEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqJdqdEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
                     //关闭事务
                     _db.CommitTran();
                 }
@@ -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 ?? "无"}");