1

Edu.Module.Customer/CustomerStudentModule.cs

@@ -8,6 +8,7 @@ using System.Text;
 using VT.FW.DB;
 using System.Linq;
 using Edu.Model.ViewModel.User;
+using Edu.Common.Plugin;
 
 namespace Edu.Module.Customer
 {
@@ -31,6 +32,11 @@ namespace Edu.Module.Customer
         /// </summary>
         private readonly RB_Student_VisitRepository student_VisitRepository = new RB_Student_VisitRepository();
 
+        /// <summary>
+        /// 学生
+        /// </summary>
+        private readonly RB_StudentRepository studentRepository = new RB_StudentRepository();
+
         /// <summary>
         /// 学员日志仓储层对象
         /// </summary>
@@ -224,6 +230,36 @@ namespace Edu.Module.Customer
                 flag = newId > 0;
                 logTitle = "新增跟进";
                 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);
             return flag;
@@ -386,6 +422,36 @@ namespace Edu.Module.Customer
                 flag = newId > 0;
                 logTitle = "新增到访";
                 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);
             return flag;

Edu.Module.Duty/VisitorReserveModule.cs

@@ -15,6 +15,9 @@ using Edu.Repository.User;
 using Edu.Common.Message;
 using Edu.Model.ViewModel.Grade;
 using Edu.Repository.Grade;
+using Edu.Repository.Customer;
+using Edu.Model.ViewModel.User;
+using Edu.Common.Plugin;
 
 namespace Edu.Module.Duty
 {
@@ -38,6 +41,16 @@ namespace Edu.Module.Duty
         /// </summary>
         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>
@@ -126,6 +139,36 @@ namespace Edu.Module.Duty
                 var newId = visitor_ReserveRepository.Insert(model);
                 model.Id = newId;
                 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;
         }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -536,6 +536,7 @@ namespace Edu.WebApi.Controllers.Course
                 CustomerId = base.ParmJObj.GetInt("CustomerId"),
                 StuIds = base.ParmJObj.GetStringValue("StuIds"),
                 OrderIdentify = base.ParmJObj.GetInt("OrderIdentify"),
+                CourseConsultantId = base.ParmJObj.GetInt("CourseConsultantId"),
             };
             var IsInsertClass = base.ParmJObj.GetInt("IsChaBan");
             if (IsInsertClass == 1)
@@ -694,6 +695,9 @@ namespace Edu.WebApi.Controllers.Course
                     model.TargetJoinType,
                     model.SourceOrderId,
                     model.TargetOrderId,
+                    model.CustomerId,
+                    model.CourseConsultantId,
+                    model.OrderIdentify
                 },
                 StepPriceList = list.Select(x => new
                 {