Skip to content

E
Education
Commit fb2df615 authored by 黄奎's avatar 黄奎
Browse files
Options

新增验证

parent fe8707c2
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 25 deletions
Edu.Cache/CacheKey.cs
View file @ fb2df615
......@@ -78,7 +78,7 @@ namespace Edu.Cache
/// </summary>
public static string AppletB2B_Login_Info_
{
get { return "AppletB2B_Login_"; }
get { return "AppletB2B_Edu_Login_"; }
}
}
......
Edu.Common/API/AppletCustomerInfo.cs
View file @ fb2df615
......@@ -98,6 +98,11 @@ namespace Edu.Common.API
/// </summary>
public int AdminId { get; set; }
/// <summary>
/// 审批状态 1-审批通过，2-拒绝
/// </summary>
public int ApproveState { get; set; }
/// <summary>
/// 同行对应的销售编号
/// </summary>
......
Edu.Model/Entity/User/RB_Student.cs
View file @ fb2df615
......@@ -201,5 +201,10 @@ namespace Edu.Model.Entity.User
/// 微信号
/// </summary>
public string WeChatNo { get; set; }
/// <summary>
/// 客户类型
/// </summary>
public int StuType { get; set; }
}
}
Edu.Module.User/StudentModule.cs
View file @ fb2df615
......@@ -233,14 +233,26 @@ namespace Edu.Module.User
/// 检查学员是否存在资料库
/// </summary>
/// <param name="model"></param>
/// <param name="Type">1-电话，2-QQ，3-微信号</param>
/// <returns></returns>
public bool CheckStudentModule(RB_Student_ViewModel model)
public bool CheckStudentModule(RB_Student_ViewModel model,int Type)
{
List<WhereHelper> where = new List<WhereHelper>()
{
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)
{
where.Add(new WhereHelper()
......@@ -258,10 +270,9 @@ namespace Edu.Module.User
/// </summary>
/// <param name="Tel"></param>
/// <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;
}
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ fb2df615
......@@ -42,6 +42,11 @@ namespace Edu.Repository.User
/// </summary>
private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository();
/// <summary>
/// 客户类型仓储层对象
/// </summary>
private readonly RB_Student_TypeRepository student_TypeRepository = new RB_Student_TypeRepository();
/// <summary>
/// 获取学生列表
/// </summary>
......@@ -390,6 +395,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);
}
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>()
{
{nameof(RB_Student_ViewModel.StuName),model.StuName.Trim() },
......@@ -409,6 +420,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.QQ),model.QQ},
{nameof(RB_Student_ViewModel.WeChatNo),model.WeChatNo},
{nameof(RB_Student_ViewModel.StuType),model.StuType},
};
//教育后台操作
if (model.OperateType == 1)
......@@ -573,7 +585,7 @@ WHERE 1=1 AND YEARWEEK(date_format(t.CreateTime, '%Y-%m-%d')) = YEARWEEK(now())
}
/// <summary>
/// 跟进电话号码获取学员信息
/// 根据电话号码、QQ、微信号获取学员信息
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
......@@ -593,10 +605,20 @@ WHERE 1=1
{
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Group_Id), query.Group_Id);
}
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.StuTel.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();
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ fb2df615
......@@ -794,12 +794,13 @@ namespace Edu.WebApi.Controllers.User
CustomerId=base.ParmJObj.GetInt("CustomerId"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
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("手机号码不正确,请重新填写!");
}
......@@ -815,11 +816,19 @@ namespace Edu.WebApi.Controllers.User
extModel.IsDisable = 1;
extModel.OperateType = 1;
if (studentModule.CheckStudentModule(extModel))
if (!string.IsNullOrEmpty(extModel.StuTel) && studentModule.CheckStudentModule(extModel, 1))
{
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);
return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed();
}
......@@ -830,22 +839,102 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns>
public ApiResult CheckExistsStu()
{
var extModel = new RB_Student_ViewModel()
var query = new RB_Student_ViewModel()
{
StuId = base.ParmJObj.GetInt("StuId"),
StuTel = base.ParmJObj.GetStringValue("StuTel"),
QQ=base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo")
};
string message = "";
var customer = base.AppletCustomerInfo;
if (customer != null&&customer.GroupId>0)
{
extModel.Group_Id = customer.GroupId;
query.Group_Id = customer.GroupId;
}
if (query.Group_Id <= 0)
{
query.Group_Id = base.UserInfo.Group_Id;
}
if (customer != null)
{
if (!string.IsNullOrEmpty(query.StuTel)&& studentModule.CheckStudentModule(query, 1))
{
message = "此学员手机号已绑定同行!请重新录入!";
}
if (!string.IsNullOrEmpty(query.QQ)&& studentModule.CheckStudentModule(query, 2))
{
message = "此学员QQ已绑定同行!请重新录入!";
}
if (!string.IsNullOrEmpty(query.WeChatNo)&&studentModule.CheckStudentModule(query, 3))
{
message = "此学员微信已绑定同行!请重新录入!";
}
}
if (extModel.Group_Id <= 0)
//后台验证
else
{
extModel.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)?.AccountName ?? "";
if (model != null && model.StuId > 0)
{
if (query.StuId > 0)
{
if (query.StuId != model.StuId)
{
message = string.Format("此学员手机号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
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)?.AccountName ?? "";
if (model != null && model.StuId > 0)
{
if (query.StuId > 0)
{
if (query.StuId != model.StuId)
{
message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
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)?.AccountName ?? "";
if (model != null && model.StuId > 0)
{
if (query.StuId > 0)
{
if (query.StuId != model.StuId)
{
message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
else
{
message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
}
}
}
}
bool flag = studentModule.CheckStudentModule(extModel);
return flag ? ApiResult.Failed(message: "此学员手机号已绑定同行!请重新录入!") : ApiResult.Success();
return !string.IsNullOrEmpty(message) ? ApiResult.Failed(message: message) : ApiResult.Success();
}
/// <summary>
......@@ -899,6 +988,7 @@ namespace Edu.WebApi.Controllers.User
StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"),
QQ=base.ParmJObj.GetStringValue("QQ"),
StuType=base.ParmJObj.GetInt("StuType"),
};
extModel.CreateType = StuCreateTypeEnum.CustomerInput;
extModel.Status = DateStateEnum.Normal;
......@@ -912,10 +1002,22 @@ namespace Edu.WebApi.Controllers.User
extModel.CustomerId = customer.CustomerId;
extModel.IsDisable = 1;
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("此学员手机号已绑定同行!请重新录入!");
}
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);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -978,8 +1080,6 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取学生实体
/// </summary>
......@@ -1045,8 +1145,22 @@ namespace Edu.WebApi.Controllers.User
[HttpPost]
public ApiResult GetStudentByTel()
{
var StuTel = base.ParmJObj.GetStringValue("StuTel");
var extModel = studentModule.GetStuByTelModule(StuTel);
var customer = base.AppletCustomerInfo;
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)
{
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