Skip to content

E
Education
Commit c37ac1b9 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 6481b4b0 fa8e3d9f
Hide whitespace changes
Inline Side-by-side
Showing with 317 additions and 31 deletions
Edu.Cache/CacheKey.cs
View file @ c37ac1b9
...@@ -78,7 +78,7 @@ namespace Edu.Cache ...@@ -78,7 +78,7 @@ namespace Edu.Cache
/// </summary> /// </summary>
public static string AppletB2B_Login_Info_ public static string AppletB2B_Login_Info_
{ {
get { return "AppletB2B_Login_"; } get { return "AppletB2B_Edu_Login_"; }
} }
} }
......
Edu.Common/API/AppletCustomerInfo.cs
View file @ c37ac1b9
...@@ -98,6 +98,11 @@ namespace Edu.Common.API ...@@ -98,6 +98,11 @@ namespace Edu.Common.API
/// </summary> /// </summary>
public int AdminId { get; set; } public int AdminId { get; set; }
/// <summary>
/// 审批状态 1-审批通过，2-拒绝
/// </summary>
public int ApproveState { get; set; }
/// <summary> /// <summary>
/// 同行对应的销售编号 /// 同行对应的销售编号
/// </summary> /// </summary>
......
Edu.Common/Enum/Course/GuestEducationEnum.cs
View file @ c37ac1b9
...@@ -55,5 +55,11 @@ namespace Edu.Common.Enum.Course ...@@ -55,5 +55,11 @@ namespace Edu.Common.Enum.Course
/// </summary> /// </summary>
[EnumField("博士后")] [EnumField("博士后")]
N9 = 9, N9 = 9,
/// <summary>
/// 在职
/// </summary>
[EnumField("在职")]
N10 = 10,
} }
} }
Edu.Model/Entity/User/RB_Student.cs
View file @ c37ac1b9
...@@ -201,5 +201,10 @@ namespace Edu.Model.Entity.User ...@@ -201,5 +201,10 @@ namespace Edu.Model.Entity.User
/// 微信号 /// 微信号
/// </summary> /// </summary>
public string WeChatNo { get; set; } public string WeChatNo { get; set; }
/// <summary>
/// 客户类型
/// </summary>
public int StuType { get; set; }
} }
} }
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ c37ac1b9
...@@ -225,6 +225,11 @@ namespace Edu.Model.ViewModel.User ...@@ -225,6 +225,11 @@ namespace Edu.Model.ViewModel.User
/// </summary> /// </summary>
public string StuStageName { get; set; } public string StuStageName { get; set; }
/// <summary>
/// 客户类型名称
/// </summary>
public string StuTypeName { get; set; }
/// <summary> /// <summary>
/// 归属类型(1-全部，2-我负责的，3-我协同的) /// 归属类型(1-全部，2-我负责的，3-我协同的)
/// </summary> /// </summary>
......
Edu.Module.User/StudentModule.cs
View file @ c37ac1b9
...@@ -80,6 +80,11 @@ namespace Edu.Module.User ...@@ -80,6 +80,11 @@ namespace Edu.Module.User
/// </summary> /// </summary>
private readonly RB_StageRepository stageRepository = new RB_StageRepository(); private readonly RB_StageRepository stageRepository = new RB_StageRepository();
/// <summary>
/// 学员类型仓储层对象
/// </summary>
private readonly RB_Student_TypeRepository student_TypeRepository = new RB_Student_TypeRepository();
/// <summary> /// <summary>
/// 获取学生列表 /// 获取学生列表
/// </summary> /// </summary>
...@@ -100,7 +105,6 @@ namespace Edu.Module.User ...@@ -100,7 +105,6 @@ namespace Edu.Module.User
/// <returns></returns> /// <returns></returns>
public List<RB_Student_ViewModel> GetStudentPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_ViewModel query) public List<RB_Student_ViewModel> GetStudentPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_ViewModel query)
{ {
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query); var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
...@@ -109,9 +113,11 @@ namespace Edu.Module.User ...@@ -109,9 +113,11 @@ namespace Edu.Module.User
{ {
Group_Id = list[0].Group_Id Group_Id = list[0].Group_Id
}); });
//学员类型列表
var stuTypeList = student_TypeRepository.GetStudentTypeListRepository(new RB_Student_Type_Extend());
string stuIds = string.Join(",", list.Select(qitem => qitem.StuId)); string stuIds = string.Join(",", list.Select(qitem => qitem.StuId));
//学员跟进 //学员跟进
var followList= followRepository.GetStudentFollowListRepository(new Model.ViewModel.Customer.RB_Student_Follow_Extend() var followList= followRepository.GetStudentFollowListRepository(new RB_Student_Follow_Extend()
{ {
QStuIds = stuIds QStuIds = stuIds
}); });
...@@ -189,8 +195,6 @@ namespace Edu.Module.User ...@@ -189,8 +195,6 @@ namespace Edu.Module.User
CustomerIds = string.Join(",", transIdList) CustomerIds = string.Join(",", transIdList)
}); });
} }
foreach (var item in list) foreach (var item in list)
{ {
...@@ -224,6 +228,7 @@ namespace Edu.Module.User ...@@ -224,6 +228,7 @@ namespace Edu.Module.User
} }
item.StuStageName = stageList?.FirstOrDefault(qitem => qitem.Id == item.StuStage)?.StageName ?? ""; item.StuStageName = stageList?.FirstOrDefault(qitem => qitem.Id == item.StuStage)?.StageName ?? "";
item.StuTypeName = stuTypeList?.FirstOrDefault(qitem => qitem.Id == item.StuType)?.Name ?? "";
} }
} }
return list; return list;
...@@ -233,14 +238,26 @@ namespace Edu.Module.User ...@@ -233,14 +238,26 @@ namespace Edu.Module.User
/// 检查学员是否存在资料库 /// 检查学员是否存在资料库
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <param name="Type">1-电话，2-QQ，3-微信号</param>
/// <returns></returns> /// <returns></returns>
public bool CheckStudentModule(RB_Student_ViewModel model) public bool CheckStudentModule(RB_Student_ViewModel model,int Type)
{ {
List<WhereHelper> where = new List<WhereHelper>() List<WhereHelper> where = new List<WhereHelper>()
{ {
new WhereHelper(nameof(RB_Student_ViewModel.Group_Id),model.Group_Id), new WhereHelper(nameof(RB_Student_ViewModel.Group_Id),model.Group_Id),
new WhereHelper(nameof(RB_Student_ViewModel.StuTel),model.StuTel),
}; };
if (Type == 1)
{
where.Add(new WhereHelper(nameof(RB_Student_ViewModel.StuTel), model.StuTel));
}
if (Type == 2)
{
where.Add(new WhereHelper(nameof(RB_Student_ViewModel.QQ), model.QQ));
}
if (Type == 3)
{
where.Add(new WhereHelper(nameof(RB_Student_ViewModel.WeChatNo), model.WeChatNo));
}
if (model.StuId > 0) if (model.StuId > 0)
{ {
where.Add(new WhereHelper() where.Add(new WhereHelper()
...@@ -258,10 +275,9 @@ namespace Edu.Module.User ...@@ -258,10 +275,9 @@ namespace Edu.Module.User
/// </summary> /// </summary>
/// <param name="Tel"></param> /// <param name="Tel"></param>
/// <returns></returns> /// <returns></returns>
public RB_Student_ViewModel GetStuByTelModule(string Tel) public RB_Student_ViewModel CheckExistsStuModule(RB_Student_ViewModel query)
{ {
var model = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel() { StuTel = Tel }); var model = studentRepository.GetStuByTelRepository(query);
return model; return model;
} }
...@@ -308,6 +324,20 @@ namespace Edu.Module.User ...@@ -308,6 +324,20 @@ namespace Edu.Module.User
return flag; return flag;
} }
/// <summary>
/// 获取协助人员列表
/// </summary>
/// <param name="StuId"></param>
/// <returns></returns>
public List<RB_Student_Assist_Extend> GetStuAssistListModule(int StuId)
{
var list = student_AssistRepository.GetStudentAssistListRepository(new RB_Student_Assist_Extend()
{
StuId = StuId
});
return list;
}
/// <summary> /// <summary>
/// 学员转交 /// 学员转交
...@@ -337,6 +367,7 @@ namespace Edu.Module.User ...@@ -337,6 +367,7 @@ namespace Edu.Module.User
}); });
extModel.AssistList = assistList; extModel.AssistList = assistList;
extModel.StuStageName = stageRepository.GetEntity(extModel.StuStage)?.StageName ?? ""; extModel.StuStageName = stageRepository.GetEntity(extModel.StuStage)?.StageName ?? "";
extModel.StuTypeName = student_TypeRepository.GetEntity(extModel.StuType)?.Name ?? "";
} }
return extModel; return extModel;
} }
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ c37ac1b9
...@@ -42,6 +42,11 @@ namespace Edu.Repository.User ...@@ -42,6 +42,11 @@ namespace Edu.Repository.User
/// </summary> /// </summary>
private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository(); private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository();
/// <summary>
/// 客户类型仓储层对象
/// </summary>
private readonly RB_Student_TypeRepository student_TypeRepository = new RB_Student_TypeRepository();
/// <summary> /// <summary>
/// 获取学生列表 /// 获取学生列表
/// </summary> /// </summary>
...@@ -158,11 +163,25 @@ WHERE 1=1 ...@@ -158,11 +163,25 @@ WHERE 1=1
builder.AppendFormat(" AND t.{0} LIKE @StuTel ", nameof(RB_Student_ViewModel.StuTel)); builder.AppendFormat(" AND t.{0} LIKE @StuTel ", nameof(RB_Student_ViewModel.StuTel));
parameters.Add("StuTel", "%" + query.StuTel.Trim() + "%"); parameters.Add("StuTel", "%" + query.StuTel.Trim() + "%");
} }
if (!string.IsNullOrWhiteSpace(query.QQ))
{
builder.AppendFormat(" AND t.{0} LIKE @QQ ", nameof(RB_Student_ViewModel.QQ));
parameters.Add("QQ", "%" + query.QQ.Trim() + "%");
}
if (!string.IsNullOrWhiteSpace(query.WeChatNo))
{
builder.AppendFormat(" AND t.{0} LIKE @WeChatNo ", nameof(RB_Student_ViewModel.WeChatNo));
parameters.Add("WeChatNo", "%" + query.WeChatNo.Trim() + "%");
}
if (!string.IsNullOrWhiteSpace(query.KeyWords)) if (!string.IsNullOrWhiteSpace(query.KeyWords))
{ {
builder.AppendFormat(" AND (t.{0} LIKE @KeyWords OR t.{1} LIKE @KeyWords) ", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.StuTel)); builder.AppendFormat(" AND (t.{0} LIKE @KeyWords OR t.{1} LIKE @KeyWords) ", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.StuTel));
parameters.Add("KeyWords", "%" + query.KeyWords.Trim() + "%"); parameters.Add("KeyWords", "%" + query.KeyWords.Trim() + "%");
} }
if (query.StuType > 0)
{
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuType), query.StuType);
}
if (query.ProviceId > 0) if (query.ProviceId > 0)
{ {
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.ProviceId), query.ProviceId); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.ProviceId), query.ProviceId);
...@@ -394,6 +413,12 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an ...@@ -394,6 +413,12 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
{ {
logContent += string.Format("微信号：由【{0}】=>【{1}】,", oldModel.WeChatNo, model.WeChatNo); logContent += string.Format("微信号：由【{0}】=>【{1}】,", oldModel.WeChatNo, model.WeChatNo);
} }
if (oldModel.StuType != model.StuType)
{
string oldName = student_TypeRepository.GetEntity(oldModel.StuType)?.Name;
string newName = student_TypeRepository.GetEntity(model.StuType)?.Name;
logContent += string.Format("客户类型：由【{0}】=>【{1}】,", oldName, newName);
}
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Student_ViewModel.StuName),model.StuName.Trim() }, {nameof(RB_Student_ViewModel.StuName),model.StuName.Trim() },
...@@ -413,6 +438,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an ...@@ -413,6 +438,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
{nameof(RB_Student_ViewModel.CustomerId),model.CustomerId}, {nameof(RB_Student_ViewModel.CustomerId),model.CustomerId},
{nameof(RB_Student_ViewModel.QQ),model.QQ}, {nameof(RB_Student_ViewModel.QQ),model.QQ},
{nameof(RB_Student_ViewModel.WeChatNo),model.WeChatNo}, {nameof(RB_Student_ViewModel.WeChatNo),model.WeChatNo},
{nameof(RB_Student_ViewModel.StuType),model.StuType},
}; };
//教育后台操作 //教育后台操作
if (model.OperateType == 1) if (model.OperateType == 1)
...@@ -577,7 +603,7 @@ WHERE 1=1 AND YEARWEEK(date_format(t.CreateTime, '%Y-%m-%d')) = YEARWEEK(now()) ...@@ -577,7 +603,7 @@ WHERE 1=1 AND YEARWEEK(date_format(t.CreateTime, '%Y-%m-%d')) = YEARWEEK(now())
} }
/// <summary> /// <summary>
/// 跟进电话号码获取学员信息 /// 根据电话号码、QQ、微信号获取学员信息
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
...@@ -597,10 +623,20 @@ WHERE 1=1 ...@@ -597,10 +623,20 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Group_Id), query.Group_Id); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Group_Id), query.Group_Id);
} }
if (!string.IsNullOrWhiteSpace(query.StuTel)) if (!string.IsNullOrWhiteSpace(query.StuTel))
{ {
builder.AppendFormat(" AND t.{0}='{1}' ", nameof(RB_Student_ViewModel.StuTel), query.StuTel); builder.AppendFormat(" AND t.{0}=@StuTel ", nameof(RB_Student_ViewModel.StuTel));
parameters.Add("StuTel", query.StuTel.Trim());
}
if (!string.IsNullOrWhiteSpace(query.QQ))
{
builder.AppendFormat(" AND t.{0}=@QQ ", nameof(RB_Student_ViewModel.QQ));
parameters.Add("QQ", query.QQ.Trim());
}
if (!string.IsNullOrWhiteSpace(query.WeChatNo))
{
builder.AppendFormat(" AND t.{0}=@WeChatNo ", nameof(RB_Student_ViewModel.WeChatNo));
parameters.Add("WeChatNo", query.WeChatNo.Trim());
} }
} }
return Get<RB_Student_ViewModel>(builder.ToString(), parameters)?.FirstOrDefault(); return Get<RB_Student_ViewModel>(builder.ToString(), parameters)?.FirstOrDefault();
......
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @ c37ac1b9
...@@ -112,7 +112,9 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -112,7 +112,9 @@ namespace Edu.WebApi.Controllers.Customer
model.UpdateTime = DateTime.Now; model.UpdateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id; model.Group_Id = base.UserInfo.Group_Id;
model.School_Id = base.UserInfo.School_Id; model.School_Id = base.UserInfo.School_Id;
model.ApproveState = 1;
model.ApproveId= base.UserInfo.Id;
model.ApproveTime = DateTime.Now;
var flag = customerModule.SetCustomerModule(model); var flag = customerModule.SetCustomerModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ c37ac1b9
...@@ -13,6 +13,7 @@ using Edu.Model.ViewModel.Customer; ...@@ -13,6 +13,7 @@ using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.Log; using Edu.Model.ViewModel.Log;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Module.Course; using Edu.Module.Course;
using Edu.Module.Customer;
using Edu.Module.Duty; using Edu.Module.Duty;
using Edu.Module.Log; using Edu.Module.Log;
using Edu.Module.User; using Edu.Module.User;
...@@ -103,6 +104,11 @@ namespace Edu.WebApi.Controllers.User ...@@ -103,6 +104,11 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
private readonly DutyPlanModule dutyPlanModule = AOP.AOPHelper.CreateAOPObject<DutyPlanModule>(); private readonly DutyPlanModule dutyPlanModule = AOP.AOPHelper.CreateAOPObject<DutyPlanModule>();
/// <summary>
/// 同业处理类对象
/// </summary>
private readonly CustomerModule customerModule = new CustomerModule();
#region 用户账户管理 #region 用户账户管理
/// <summary> /// <summary>
...@@ -670,7 +676,10 @@ namespace Edu.WebApi.Controllers.User ...@@ -670,7 +676,10 @@ namespace Edu.WebApi.Controllers.User
StartTime = base.ParmJObj.GetStringValue("StartTime"), StartTime = base.ParmJObj.GetStringValue("StartTime"),
EndTime = base.ParmJObj.GetStringValue("EndTime"), EndTime = base.ParmJObj.GetStringValue("EndTime"),
BelongType=base.ParmJObj.GetInt("BelongType"), BelongType=base.ParmJObj.GetInt("BelongType"),
QStudentType = base.ParmJObj.GetInt("QStudentType", -1) QStudentType = base.ParmJObj.GetInt("QStudentType", -1),
QQ=base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"),
StuType=base.ParmJObj.GetInt("StuType"),
}; };
if (query.IsQueryMyStu == 1) if (query.IsQueryMyStu == 1)
{ {
...@@ -737,6 +746,10 @@ namespace Edu.WebApi.Controllers.User ...@@ -737,6 +746,10 @@ namespace Edu.WebApi.Controllers.User
item.TrialLessonCount, item.TrialLessonCount,
item.StuSourceId, item.StuSourceId,
item.StuSourceIdName, item.StuSourceIdName,
item.QQ,
item.WeChatNo,
item.StuType,
item.StuTypeName,
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
...@@ -795,12 +808,13 @@ namespace Edu.WebApi.Controllers.User ...@@ -795,12 +808,13 @@ namespace Edu.WebApi.Controllers.User
CustomerId=base.ParmJObj.GetInt("CustomerId"), CustomerId=base.ParmJObj.GetInt("CustomerId"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"), WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
QQ = base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
StuType=base.ParmJObj.GetInt("StuType"),
}; };
if (string.IsNullOrEmpty(extModel.StuTel)) if (string.IsNullOrEmpty(extModel.StuTel)&&string.IsNullOrEmpty(extModel.QQ)&&string.IsNullOrEmpty(extModel.WeChatNo))
{ {
return ApiResult.Failed("请填写手机号码!"); return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!");
} }
if (!Common.Plugin.StringHelper.IsMobilePhone(extModel.StuTel)) if (!string.IsNullOrEmpty(extModel.StuTel) && !Common.Plugin.StringHelper.IsMobilePhone(extModel.StuTel))
{ {
return ApiResult.Failed("手机号码不正确,请重新填写!"); return ApiResult.Failed("手机号码不正确,请重新填写!");
} }
...@@ -816,11 +830,19 @@ namespace Edu.WebApi.Controllers.User ...@@ -816,11 +830,19 @@ namespace Edu.WebApi.Controllers.User
extModel.IsDisable = 1; extModel.IsDisable = 1;
extModel.OperateType = 1; extModel.OperateType = 1;
if (studentModule.CheckStudentModule(extModel)) if (!string.IsNullOrEmpty(extModel.StuTel) && studentModule.CheckStudentModule(extModel, 1))
{ {
return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!"); return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!");
} }
if (!string.IsNullOrEmpty(extModel.QQ) && studentModule.CheckStudentModule(extModel, 2))
{
return ApiResult.Failed("此学员QQ号已绑定同行!请重新录入!");
}
if (!string.IsNullOrEmpty(extModel.WeChatNo) && studentModule.CheckStudentModule(extModel, 3))
{
return ApiResult.Failed("此学员微信号已绑定同行!请重新录入!");
}
bool flag = studentModule.SetStudentModule(extModel); bool flag = studentModule.SetStudentModule(extModel);
return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed(); return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed();
} }
...@@ -831,22 +853,167 @@ namespace Edu.WebApi.Controllers.User ...@@ -831,22 +853,167 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns> /// <returns></returns>
public ApiResult CheckExistsStu() public ApiResult CheckExistsStu()
{ {
var extModel = new RB_Student_ViewModel() var query = new RB_Student_ViewModel()
{ {
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
StuTel = base.ParmJObj.GetStringValue("StuTel"), StuTel = base.ParmJObj.GetStringValue("StuTel"),
QQ=base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo")
}; };
string message = "";
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
//是否是同行注册
bool isB2B = false;
if (customer != null&&customer.GroupId>0) if (customer != null&&customer.GroupId>0)
{ {
extModel.Group_Id = customer.GroupId; query.Group_Id = customer.GroupId;
isB2B = true;
} }
if (extModel.Group_Id <= 0) if (query.Group_Id <= 0)
{ {
extModel.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
}
if (!string.IsNullOrEmpty(query.StuTel))
{
var model = studentModule.CheckExistsStuModule(new RB_Student_ViewModel() { Group_Id = query.Group_Id, StuTel = query.StuTel });
string name = UserReidsCache.GetUserLoginInfo((model?.CreateBy ?? 0))?.AccountName ?? "";
if (model != null && model.StuId > 0)
{
if (query.StuId > 0)
{
if (query.StuId != model.StuId)
{
if (isB2B)
{
message = "此学员手机号已绑定同行!请重新录入!";
PushMessage(model);
}
else
{
message = string.Format("此学员手机号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
else
{
if (isB2B)
{
message = "此学员手机号已绑定同行!请重新录入!";
}
else
{
message = string.Format("此学员手机号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
}
if (!string.IsNullOrEmpty(query.QQ))
{
var model = studentModule.CheckExistsStuModule(new RB_Student_ViewModel() { Group_Id = query.Group_Id, QQ = query.QQ });
string name = UserReidsCache.GetUserLoginInfo((model?.CreateBy ?? 0))?.AccountName ?? "";
if (model != null && model.StuId > 0)
{
if (query.StuId > 0)
{
if (query.StuId != model.StuId)
{
if (isB2B)
{
message = "此学员QQ已绑定同行!请重新录入!";
PushMessage(model);
}
else
{
message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
else
{
if (isB2B)
{
message = "此学员QQ已绑定同行!请重新录入!";
}
else
{
message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
}
if (!string.IsNullOrEmpty(query.WeChatNo))
{
var model = studentModule.CheckExistsStuModule(new RB_Student_ViewModel() { Group_Id = query.Group_Id, WeChatNo = query.WeChatNo });
string name = UserReidsCache.GetUserLoginInfo((model?.CreateBy ?? 0))?.AccountName ?? "";
if (model != null && model.StuId > 0)
{
if (query.StuId > 0)
{
if (query.StuId != model.StuId)
{
if (isB2B)
{
message = "此学员微信号已绑定同行!请重新录入!";
}
else
{
message = string.Format("此学员微信号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
else
{
if (isB2B)
{
message = "此学员微信号已绑定同行!请重新录入!";
PushMessage(model);
}
else
{
message = string.Format("此学员微信号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
}
return !string.IsNullOrEmpty(message) ? ApiResult.Failed(message: message) : ApiResult.Success();
}
/// <summary>
/// 推送消息
/// </summary>
/// <param name="model"></param>
public void PushMessage(RB_Student_ViewModel model)
{
var assistList = studentModule.GetStuAssistListModule(model.StuId);
var customerModel = customerModule.GetCustomerModule(model.CustomerId);
string markdownContent = $"`同业添加学生查重通知` \n>**概要信息** \n>同业名称：{customerModel?.CustomerName ?? ""}({customerModel?.ContactNumber ?? ""})\n>学生名称：{model.StuName}\n>学生电话：{model.StuTel}\n>";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = Common.Enum.System.PushMessageCategoryEnum.B2BCustomerStu,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "同业添加学生通知",
Platform = 5,
};
if (model.CreateBy > 0)
{
modelWork.ReceiveId = model.CreateType.ToString();
Common.Message.MessageHelper.SendMessage(modelWork);
}
if (assistList != null && assistList.Count > 0)
{
foreach (var item in assistList)
{
modelWork.ReceiveId = item.AssistId.ToString();
Common.Message.MessageHelper.SendMessage(modelWork);
}
} }
bool flag = studentModule.CheckStudentModule(extModel);
return flag ? ApiResult.Failed(message: "此学员手机号已绑定同行!请重新录入!") : ApiResult.Success();
} }
/// <summary> /// <summary>
...@@ -900,6 +1067,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -900,6 +1067,7 @@ namespace Edu.WebApi.Controllers.User
StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"), StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"), WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"),
QQ=base.ParmJObj.GetStringValue("QQ"), QQ=base.ParmJObj.GetStringValue("QQ"),
StuType=base.ParmJObj.GetInt("StuType"),
}; };
extModel.CreateType = StuCreateTypeEnum.CustomerInput; extModel.CreateType = StuCreateTypeEnum.CustomerInput;
extModel.Status = DateStateEnum.Normal; extModel.Status = DateStateEnum.Normal;
...@@ -913,10 +1081,22 @@ namespace Edu.WebApi.Controllers.User ...@@ -913,10 +1081,22 @@ namespace Edu.WebApi.Controllers.User
extModel.CustomerId = customer.CustomerId; extModel.CustomerId = customer.CustomerId;
extModel.IsDisable = 1; extModel.IsDisable = 1;
extModel.OperateType = 2; extModel.OperateType = 2;
if (studentModule.CheckStudentModule(extModel)) if (string.IsNullOrEmpty(extModel.StuTel) && string.IsNullOrEmpty(extModel.QQ) && string.IsNullOrEmpty(extModel.WeChatNo))
{
return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!");
}
if (!string.IsNullOrEmpty(extModel.StuTel) && studentModule.CheckStudentModule(extModel,1))
{ {
return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!"); return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!");
} }
if (!string.IsNullOrEmpty(extModel.QQ) && studentModule.CheckStudentModule(extModel, 2))
{
return ApiResult.Failed("此学员QQ号已绑定同行!请重新录入!");
}
if (!string.IsNullOrEmpty(extModel.WeChatNo) && studentModule.CheckStudentModule(extModel, 3))
{
return ApiResult.Failed("此学员微信号已绑定同行!请重新录入!");
}
bool flag = studentModule.SetStudentModule(extModel, 1); bool flag = studentModule.SetStudentModule(extModel, 1);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
...@@ -979,8 +1159,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -979,8 +1159,6 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
/// <summary> /// <summary>
/// 获取学生实体 /// 获取学生实体
/// </summary> /// </summary>
...@@ -1034,6 +1212,10 @@ namespace Edu.WebApi.Controllers.User ...@@ -1034,6 +1212,10 @@ namespace Edu.WebApi.Controllers.User
extModel.PlatformName, extModel.PlatformName,
AssistList = extModel?.AssistList ?? new List<RB_Student_Assist_Extend>(), AssistList = extModel?.AssistList ?? new List<RB_Student_Assist_Extend>(),
extModel.StuSourceId, extModel.StuSourceId,
extModel.QQ,
extModel.WeChatNo,
extModel.StuType,
extModel.StuTypeName,
}; };
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
...@@ -1046,8 +1228,22 @@ namespace Edu.WebApi.Controllers.User ...@@ -1046,8 +1228,22 @@ namespace Edu.WebApi.Controllers.User
[HttpPost] [HttpPost]
public ApiResult GetStudentByTel() public ApiResult GetStudentByTel()
{ {
var StuTel = base.ParmJObj.GetStringValue("StuTel"); var customer = base.AppletCustomerInfo;
var extModel = studentModule.GetStuByTelModule(StuTel); var query = new RB_Student_ViewModel()
{
StuTel= base.ParmJObj.GetStringValue("StuTel"),
QQ=base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo")
};
if (customer != null && customer.GroupId > 0)
{
query.Group_Id = customer.GroupId;
}
if (query.Group_Id <= 0)
{
query.Group_Id = base.UserInfo.Group_Id;
}
var extModel = studentModule.CheckExistsStuModule(query);
if (extModel != null && extModel.CreateBy > 0) if (extModel != null && extModel.CreateBy > 0)
{ {
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? ""; extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment