diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
index cefe764..8a59841 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
@@ -13,156 +13,156 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
/// 开单编号
///
public string id { get; set; }
-
+
///
/// 单据门店
///
public string djmd { get; set; }
-
+
///
/// 金三角
///
public string jsj { get; set; }
-
+
///
/// 开单日期
///
public DateTime? kdrq { get; set; }
-
+
///
/// 顾客类型
///
public string gjlx { get; set; }
-
+
///
/// 合作机构
///
public string hgjg { get; set; }
-
+
///
/// 整单业绩
///
public decimal zdyj { get; set; }
-
+
///
/// 实付业绩
///
public decimal sfyj { get; set; }
-
+
///
/// 欠款
///
public decimal qk { get; set; }
-
+
///
/// 储扣方式
///
public string ckfs { get; set; }
-
+
///
/// 储扣明细
///
public string ckmx { get; set; }
-
+
///
/// 付款方式
///
public string fkfs { get; set; }
-
+
///
/// 付款医院
///
public string fkyy { get; set; }
-
+
///
/// 付款判断
///
public string fkpd { get; set; }
-
+
///
/// 客户来源
///
public string khly { get; set; }
-
+
///
/// 推荐人
///
public string tjr { get; set; }
-
+
///
/// 是否首开订单
///
public string sfskdd { get; set; }
-
+
///
/// 简介
///
public string jj { get; set; }
-
+
///
/// 上传文件
///
public List scwj { get; set; }
-
+
///
/// 会员签字
///
public List hyqz { get; set; }
-
+
///
/// 备注
///
public string bz { get; set; }
-
+
///
/// 开单会员
///
public string kdhy { get; set; }
-
+
///
/// 开单会员名称
///
public string kdhyc { get; set; }
-
+
///
/// 开单会员手机号
///
public string kdhysjh { get; set; }
-
+
///
/// 健康师业绩
///
public string jksyj { get; set; }
-
+
///
/// 科技部老师业绩
///
public string kjblsyj { get; set; }
-
+
///
/// 品项信息
///
public string pxxx { get; set; }
-
+
///
/// 方案其他
///
public string F_FIleUrl { get; set; }
-
+
///
/// 健康师业绩
///
public List lqKdJksyjList { get; set; }
-
+
///
/// 科技部老师业绩
///
public List lqKdKjbsyjList { get; set; }
-
+
///
/// 开单_品项明细
///
public List lqKdPxmxList { get; set; }
-
+
}
}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
index 18f2073..8906310 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
@@ -121,6 +121,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
public string mrs { get; set; }
///
+ /// 美容师名称
+ ///
+ public string mrsName { get; set; }
+
+ ///
/// 进店渠道
///
public string jdqd { get; set; }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
index f235ff0..e8a6067 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -396,7 +396,7 @@ namespace NCC.Extend.LqKdKdjlb
var entityInfo = await GetInfo(newEntity.Id);
if (entityInfo != null)
{
- var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo);
+ var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo, HealthInstructorNames);
Console.WriteLine("开单记录字符串生成成功:");
Console.WriteLine(orderRecordString);
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
index 8a5458e..ef2d61c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
@@ -29,6 +29,7 @@ using NCC.Extend.Entitys.lq_mdxx;
using NCC.Extend.Entitys.lq_xh_hyhk;
using NCC.Extend.Entitys.lq_xh_pxmx;
using NCC.Extend.Interfaces.LqKhxx;
+using NCC.System.Entitys.Permission;
using NCC.FriendlyException;
using NCC.JsonSerialization;
using SqlSugar;
@@ -126,6 +127,7 @@ namespace NCC.Extend.LqKhxx
tjr = it.Tjr,
fzgw = it.Fzgw,
mrs = it.Mrs,
+ mrsName = SqlFunc.Subqueryable().Where(u => u.Id == it.Mrs).Select(u => u.RealName),
jdqd = it.Jdqd,
lxdz = it.Lxdz,
bz = it.Bz,
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
index 11f7505..e025ff6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
@@ -186,6 +186,13 @@ namespace NCC.Extend.LqTkjlb
MemberInfo.Sjh = input.customerPhone; // 设置手机号
MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString();
MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmss");
+ //找到input.expansionUserId的用户信息
+ var userInfo = await _db.Queryable().Where(u => u.Id == input.expansionUserId).FirstAsync();
+ //判断 岗位是否为健康师,如果是健康师,则设置健康师为负责人
+ if (userInfo.Gw == "健康师")
+ {
+ MemberInfo.Mrs = input.expansionUserId;
+ }
MemberInfo.Gsmd = eventUserInfo.StoreId;
var memberResult = await _db.Insertable(MemberInfo).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
if (!(memberResult > 0))
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
index 38e59ce..39bb54f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs
@@ -27,8 +27,9 @@ namespace NCC.Extend.Utils
/// 生成开单记录字符串
///
/// 开单记录实体
+ /// 健康师姓名
/// 格式化的字符串
- public string GenerateOrderRecordString(LqKdKdjlbInfoOutput entity)
+ public string GenerateOrderRecordString(LqKdKdjlbInfoOutput entity, string HealthInstructorNames)
{
if (entity == null)
{
@@ -45,7 +46,7 @@ namespace NCC.Extend.Utils
var customerName = GetCustomerName(entity.kdhy);
sb.AppendLine($"⏩顾客姓名:{customerName}");
// 健康师:王维
- var healthTeachers = GetHealthTeachers(entity.lqKdJksyjList);
+ var healthTeachers = HealthInstructorNames.TrimEnd(',');
sb.AppendLine($"⏩健康师:{healthTeachers}");
// 活动方案:532工程
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs
index 8afbae1..3fc0d7e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotTestController.cs
@@ -94,7 +94,7 @@ namespace NCC.Extend.Utils
}
};
- return _stringGenerator.GenerateOrderRecordString(testEntity);
+ return _stringGenerator.GenerateOrderRecordString(testEntity, "测试健康师1,测试健康师2");
}
}
}