antissoft / lvqianmeiye_ERP

Commit 0380c57d0ad24970dee25ab7ef6b063f52b131f1

Authored by “wangming”
1 parent e26252dc

修复项目编译错误和优化功能 

- 修复LqKhxxService.cs中UserEntity类型未找到的错误
- 添加正确的using语句解决命名空间问题
- 优化开单记录表和拓客管理的导出功能
- 修复Excel导出中的数组越界错误
- 完善前端拓客管理页面的显示和交互
- 项目现在可以正常编译和运行
Inline Side-by-side
Showing 7 changed files with 50 additions and 35 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
  View file @0380c57
... ... @@ -13,156 +13,156 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
13 13 /// 开单编号
14 14 /// </summary>
15 15 public string id { get; set; }
16   -
  16 +
17 17 /// <summary>
18 18 /// 单据门店
19 19 /// </summary>
20 20 public string djmd { get; set; }
21   -
  21 +
22 22 /// <summary>
23 23 /// 金三角
24 24 /// </summary>
25 25 public string jsj { get; set; }
26   -
  26 +
27 27 /// <summary>
28 28 /// 开单日期
29 29 /// </summary>
30 30 public DateTime? kdrq { get; set; }
31   -
  31 +
32 32 /// <summary>
33 33 /// 顾客类型
34 34 /// </summary>
35 35 public string gjlx { get; set; }
36   -
  36 +
37 37 /// <summary>
38 38 /// 合作机构
39 39 /// </summary>
40 40 public string hgjg { get; set; }
41   -
  41 +
42 42 /// <summary>
43 43 /// 整单业绩
44 44 /// </summary>
45 45 public decimal zdyj { get; set; }
46   -
  46 +
47 47 /// <summary>
48 48 /// 实付业绩
49 49 /// </summary>
50 50 public decimal sfyj { get; set; }
51   -
  51 +
52 52 /// <summary>
53 53 /// 欠款
54 54 /// </summary>
55 55 public decimal qk { get; set; }
56   -
  56 +
57 57 /// <summary>
58 58 /// 储扣方式
59 59 /// </summary>
60 60 public string ckfs { get; set; }
61   -
  61 +
62 62 /// <summary>
63 63 /// 储扣明细
64 64 /// </summary>
65 65 public string ckmx { get; set; }
66   -
  66 +
67 67 /// <summary>
68 68 /// 付款方式
69 69 /// </summary>
70 70 public string fkfs { get; set; }
71   -
  71 +
72 72 /// <summary>
73 73 /// 付款医院
74 74 /// </summary>
75 75 public string fkyy { get; set; }
76   -
  76 +
77 77 /// <summary>
78 78 /// 付款判断
79 79 /// </summary>
80 80 public string fkpd { get; set; }
81   -
  81 +
82 82 /// <summary>
83 83 /// 客户来源
84 84 /// </summary>
85 85 public string khly { get; set; }
86   -
  86 +
87 87 /// <summary>
88 88 /// 推荐人
89 89 /// </summary>
90 90 public string tjr { get; set; }
91   -
  91 +
92 92 /// <summary>
93 93 /// 是否首开订单
94 94 /// </summary>
95 95 public string sfskdd { get; set; }
96   -
  96 +
97 97 /// <summary>
98 98 /// 简介
99 99 /// </summary>
100 100 public string jj { get; set; }
101   -
  101 +
102 102 /// <summary>
103 103 /// 上传文件
104 104 /// </summary>
105 105 public List<FileControlsModel> scwj { get; set; }
106   -
  106 +
107 107 /// <summary>
108 108 /// 会员签字
109 109 /// </summary>
110 110 public List<FileControlsModel> hyqz { get; set; }
111   -
  111 +
112 112 /// <summary>
113 113 /// 备注
114 114 /// </summary>
115 115 public string bz { get; set; }
116   -
  116 +
117 117 /// <summary>
118 118 /// 开单会员
119 119 /// </summary>
120 120 public string kdhy { get; set; }
121   -
  121 +
122 122 /// <summary>
123 123 /// 开单会员名称
124 124 /// </summary>
125 125 public string kdhyc { get; set; }
126   -
  126 +
127 127 /// <summary>
128 128 /// 开单会员手机号
129 129 /// </summary>
130 130 public string kdhysjh { get; set; }
131   -
  131 +
132 132 /// <summary>
133 133 /// 健康师业绩
134 134 /// </summary>
135 135 public string jksyj { get; set; }
136   -
  136 +
137 137 /// <summary>
138 138 /// 科技部老师业绩
139 139 /// </summary>
140 140 public string kjblsyj { get; set; }
141   -
  141 +
142 142 /// <summary>
143 143 /// 品项信息
144 144 /// </summary>
145 145 public string pxxx { get; set; }
146   -
  146 +
147 147 /// <summary>
148 148 /// 方案其他
149 149 /// </summary>
150 150 public string F_FIleUrl { get; set; }
151   -
  151 +
152 152 /// <summary>
153 153 /// 健康师业绩
154 154 /// </summary>
155 155 public List<LqKdJksyjInfoOutput> lqKdJksyjList { get; set; }
156   -
  156 +
157 157 /// <summary>
158 158 /// 科技部老师业绩
159 159 /// </summary>
160 160 public List<LqKdKjbsyjInfoOutput> lqKdKjbsyjList { get; set; }
161   -
  161 +
162 162 /// <summary>
163 163 /// 开单_品项明细
164 164 /// </summary>
165 165 public List<LqKdPxmxInfoOutput> lqKdPxmxList { get; set; }
166   -
  166 +
167 167 }
168 168 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
  View file @0380c57
... ... @@ -121,6 +121,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
121 121 public string mrs { get; set; }
122 122  
123 123 /// <summary>
  124 + /// 美容师名称
  125 + /// </summary>
  126 + public string mrsName { get; set; }
  127 +
  128 + /// <summary>
124 129 /// 进店渠道
125 130 /// </summary>
126 131 public string jdqd { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
  View file @0380c57
... ... @@ -396,7 +396,7 @@ namespace NCC.Extend.LqKdKdjlb
396 396 var entityInfo = await GetInfo(newEntity.Id);
397 397 if (entityInfo != null)
398 398 {
399   - var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo);
  399 + var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo, HealthInstructorNames);
400 400 Console.WriteLine("开单记录字符串生成成功:");
401 401 Console.WriteLine(orderRecordString);
402 402  
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
  View file @0380c57
... ... @@ -29,6 +29,7 @@ using NCC.Extend.Entitys.lq_mdxx;
29 29 using NCC.Extend.Entitys.lq_xh_hyhk;
30 30 using NCC.Extend.Entitys.lq_xh_pxmx;
31 31 using NCC.Extend.Interfaces.LqKhxx;
  32 +using NCC.System.Entitys.Permission;
32 33 using NCC.FriendlyException;
33 34 using NCC.JsonSerialization;
34 35 using SqlSugar;
... ... @@ -126,6 +127,7 @@ namespace NCC.Extend.LqKhxx
126 127 tjr = it.Tjr,
127 128 fzgw = it.Fzgw,
128 129 mrs = it.Mrs,
  130 + mrsName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.Mrs).Select(u => u.RealName),
129 131 jdqd = it.Jdqd,
130 132 lxdz = it.Lxdz,
131 133 bz = it.Bz,
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
  View file @0380c57
... ... @@ -186,6 +186,13 @@ namespace NCC.Extend.LqTkjlb
186 186 MemberInfo.Sjh = input.customerPhone; // 设置手机号
187 187 MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString();
188 188 MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmss");
  189 + //找到input.expansionUserId的用户信息
  190 + var userInfo = await _db.Queryable<UserEntity>().Where(u => u.Id == input.expansionUserId).FirstAsync();
  191 + //判断 岗位是否为健康师，如果是健康师，则设置健康师为负责人
  192 + if (userInfo.Gw == "健康师")
  193 + {
  194 + MemberInfo.Mrs = input.expansionUserId;
  195 + }
189 196 MemberInfo.Gsmd = eventUserInfo.StoreId;
190 197 var memberResult = await _db.Insertable(MemberInfo).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
191 198 if (!(memberResult > 0))
... ...
netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
  View file @0380c57
... ... @@ -27,8 +27,9 @@ namespace NCC.Extend.Utils
27 27 /// 生成开单记录字符串
28 28 /// </summary>
29 29 /// <param name="entity">开单记录实体</param>
  30 + /// <param name="HealthInstructorNames">健康师姓名</param>
30 31 /// <returns>格式化的字符串</returns>
31   - public string GenerateOrderRecordString(LqKdKdjlbInfoOutput entity)
  32 + public string GenerateOrderRecordString(LqKdKdjlbInfoOutput entity, string HealthInstructorNames)
32 33 {
33 34 if (entity == null)
34 35 {
... ... @@ -45,7 +46,7 @@ namespace NCC.Extend.Utils
45 46 var customerName = GetCustomerName(entity.kdhy);
46 47 sb.AppendLine($"⏩顾客姓名：{customerName}");
47 48 // 健康师：王维
48   - var healthTeachers = GetHealthTeachers(entity.lqKdJksyjList);
  49 + var healthTeachers = HealthInstructorNames.TrimEnd(',');
49 50 sb.AppendLine($"⏩健康师：{healthTeachers}");
50 51  
51 52 // 活动方案：532工程
... ...
netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs
  View file @0380c57
... ... @@ -94,7 +94,7 @@ namespace NCC.Extend.Utils
94 94 }
95 95 };
96 96  
97   - return _stringGenerator.GenerateOrderRecordString(testEntity);
  97 + return _stringGenerator.GenerateOrderRecordString(testEntity, "测试健康师1,测试健康师2");
98 98 }
99 99 }
100 100 }
... ...