Skip to content

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

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

parents 12b48e44 ef477746
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 23 deletions
Edu.Module.Course/OrderModule.cs
View file @ 50865acc
This diff is collapsed.
Edu.Module.Course/OrderModule2.cs
View file @ 50865acc
...@@ -311,7 +311,7 @@ namespace Edu.Module.Course ...@@ -311,7 +311,7 @@ namespace Edu.Module.Course
{ {
message = ""; message = "";
//查询学生列表 //查询学生列表
var StuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = userInfo.Group_Id, StuIds = stuIds }); var StuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = userInfo.Group_Id, StuIds = stuIds, School_Id = -1 });
//根据客人手机号码 验证是否是续费 //根据客人手机号码 验证是否是续费
if (StuList.Select(x => x.CustomerId).Distinct().Count() > 1) if (StuList.Select(x => x.CustomerId).Distinct().Count() > 1)
{ {
......
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 50865acc
...@@ -32,6 +32,11 @@ namespace Edu.Module.Customer ...@@ -32,6 +32,11 @@ namespace Edu.Module.Customer
/// </summary> /// </summary>
private readonly RB_Student_VisitRepository student_VisitRepository = new RB_Student_VisitRepository(); private readonly RB_Student_VisitRepository student_VisitRepository = new RB_Student_VisitRepository();
/// <summary>
/// 学生
/// </summary>
private readonly RB_StudentRepository studentRepository = new RB_StudentRepository();
/// <summary> /// <summary>
/// 学员日志仓储层对象 /// 学员日志仓储层对象
/// </summary> /// </summary>
...@@ -225,6 +230,36 @@ namespace Edu.Module.Customer ...@@ -225,6 +230,36 @@ namespace Edu.Module.Customer
flag = newId > 0; flag = newId > 0;
logTitle = "新增跟进"; logTitle = "新增跟进";
logContent = model.Remark; logContent = model.Remark;
if (flag) {
//获取学生信息
var smodel = studentRepository.GetEntity(model.StuId);
if (smodel != null && smodel.StuStage == Common.Enum.User.StuStageEnum.NewStu)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.PreliminaryCommunication}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof (RB_Student_ViewModel.StuId),
FiledValue = model.StuId,
OperatorEnum =OperatorEnum.Equal
}
};
studentRepository.Update(keyValues, wheres);
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{
LogId = 0,
CreateBy = model.CreateBy,
CreateTime = DateTime.Now,
CreateType = 1,
Group_Id = model.Group_Id,
LogContent = "首次跟进，客户阶段由'" + (Common.Enum.User.StuStageEnum.NewStu.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.PreliminaryCommunication.ToName()) + "'",
LogTitle = "客户阶段变更",
LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
StuId = model.StuId
});
}
}
} }
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.Follow, logTitle, logContent, model.CreateBy); student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.Follow, logTitle, logContent, model.CreateBy);
return flag; return flag;
...@@ -387,6 +422,36 @@ namespace Edu.Module.Customer ...@@ -387,6 +422,36 @@ namespace Edu.Module.Customer
flag = newId > 0; flag = newId > 0;
logTitle = "新增到访"; logTitle = "新增到访";
logContent = model.Remark; logContent = model.Remark;
if (flag) {
//获取学生信息
var smodel = studentRepository.GetEntity(model.StuId);
if (smodel != null && smodel.StuStage == Common.Enum.User.StuStageEnum.NewStu)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.PreliminaryCommunication}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof (RB_Student_ViewModel.StuId),
FiledValue = model.StuId,
OperatorEnum =OperatorEnum.Equal
}
};
studentRepository.Update(keyValues, wheres);
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{
LogId = 0,
CreateBy = model.CreateBy,
CreateTime = DateTime.Now,
CreateType = 1,
Group_Id = model.Group_Id,
LogContent = "首次拜访，客户阶段由'" + (Common.Enum.User.StuStageEnum.NewStu.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.PreliminaryCommunication.ToName()) + "'",
LogTitle = "客户阶段变更",
LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
StuId = model.StuId
});
}
}
} }
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.Visit, logTitle, logContent, model.CreateBy); student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.Visit, logTitle, logContent, model.CreateBy);
return flag; return flag;
......
Edu.Module.Duty/VisitorReserveModule.cs
View file @ 50865acc
...@@ -15,6 +15,9 @@ using Edu.Repository.User; ...@@ -15,6 +15,9 @@ using Edu.Repository.User;
using Edu.Common.Message; using Edu.Common.Message;
using Edu.Model.ViewModel.Grade; using Edu.Model.ViewModel.Grade;
using Edu.Repository.Grade; using Edu.Repository.Grade;
using Edu.Repository.Customer;
using Edu.Model.ViewModel.User;
using Edu.Common.Plugin;
namespace Edu.Module.Duty namespace Edu.Module.Duty
{ {
...@@ -38,6 +41,16 @@ namespace Edu.Module.Duty ...@@ -38,6 +41,16 @@ namespace Edu.Module.Duty
/// </summary> /// </summary>
private readonly RB_Class_PlanRepository class_PlanRepository = new RB_Class_PlanRepository(); private readonly RB_Class_PlanRepository class_PlanRepository = new RB_Class_PlanRepository();
/// <summary>
/// 学生
/// </summary>
private readonly RB_StudentRepository studentRepository = new RB_StudentRepository();
/// <summary>
/// 学员日志仓储层对象
/// </summary>
private readonly RB_Student_LogRepository student_LogRepository = new RB_Student_LogRepository();
/// <summary> /// <summary>
/// 账号管理仓储层对象 /// 账号管理仓储层对象
/// </summary> /// </summary>
...@@ -126,6 +139,36 @@ namespace Edu.Module.Duty ...@@ -126,6 +139,36 @@ namespace Edu.Module.Duty
var newId = visitor_ReserveRepository.Insert(model); var newId = visitor_ReserveRepository.Insert(model);
model.Id = newId; model.Id = newId;
flag = newId > 0; flag = newId > 0;
if (flag) {
//获取学生信息
var smodel = studentRepository.GetEntity(model.Visitor_Id);
if (smodel != null && smodel.StuStage <= Common.Enum.User.StuStageEnum.PreliminaryCommunication)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.Audition}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof (RB_Student_ViewModel.StuId),
FiledValue = model.Visitor_Id,
OperatorEnum =OperatorEnum.Equal
}
};
studentRepository.Update(keyValues, wheres);
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{
LogId = 0,
CreateBy = model.CreateBy,
CreateTime = DateTime.Now,
CreateType = 1,
Group_Id = model.Group_Id,
LogContent = "首次试听，客户阶段由'" + (smodel.StuStage.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.Audition.ToName()) + "'",
LogTitle = "客户阶段变更",
LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
StuId = model.Visitor_Id
});
}
}
} }
return flag; return flag;
} }
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ 50865acc
...@@ -79,6 +79,10 @@ WHERE 1=1 ...@@ -79,6 +79,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.AreaId), query.AreaId); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.AreaId), query.AreaId);
} }
if (query.CustomerId > 0)
{
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CustomerId), query.CustomerId);
}
if (!string.IsNullOrEmpty(query.StuIds)) if (!string.IsNullOrEmpty(query.StuIds))
{ {
builder.AppendFormat(" AND t.{0} in({1}) ", nameof(RB_Student_ViewModel.StuId), query.StuIds); builder.AppendFormat(" AND t.{0} in({1}) ", nameof(RB_Student_ViewModel.StuId), query.StuIds);
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 50865acc
...@@ -536,6 +536,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -536,6 +536,7 @@ namespace Edu.WebApi.Controllers.Course
CustomerId = base.ParmJObj.GetInt("CustomerId"), CustomerId = base.ParmJObj.GetInt("CustomerId"),
StuIds = base.ParmJObj.GetStringValue("StuIds"), StuIds = base.ParmJObj.GetStringValue("StuIds"),
OrderIdentify = base.ParmJObj.GetInt("OrderIdentify"), OrderIdentify = base.ParmJObj.GetInt("OrderIdentify"),
CourseConsultantId = base.ParmJObj.GetInt("CourseConsultantId"),
}; };
var IsInsertClass = base.ParmJObj.GetInt("IsChaBan"); var IsInsertClass = base.ParmJObj.GetInt("IsChaBan");
if (IsInsertClass == 1) if (IsInsertClass == 1)
...@@ -694,6 +695,15 @@ namespace Edu.WebApi.Controllers.Course ...@@ -694,6 +695,15 @@ namespace Edu.WebApi.Controllers.Course
model.TargetJoinType, model.TargetJoinType,
model.SourceOrderId, model.SourceOrderId,
model.TargetOrderId, model.TargetOrderId,
model.CustomerId,
model.CourseConsultantId,
model.OrderIdentify,
model.B2CRatio,
model.B2CReNewRatio,
model.B2BRebateRatio,
model.B2BReNewRatio,
model.SchoolRebateRatio,
model.SchoolReNewRatio
}, },
StepPriceList = list.Select(x => new StepPriceList = list.Select(x => new
{ {
......
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