页面修改

Edu.Model/Entity/Sell/RB_Bouns_PlanDetail.cs

@@ -33,6 +33,11 @@ namespace Edu.Model.Entity.Sell
 		/// </summary>
 		public decimal EndNum { get; set; }
 
+		/// <summary>
+		/// 奖励金额
+		/// </summary>
+		public decimal Money { get; set; }
+
 		/// <summary>
 		/// 删除状态
 		/// </summary>

Edu.Model/Entity/Sell/RB_Order_Guest.cs

@@ -75,7 +75,7 @@ namespace Edu.Model.Entity.Sell
         /// <summary>
         /// 学习目的
         /// </summary>
-        public GuestLearningGoalsEnum LearningGoals { get; set; }
+        public int LearningGoals { get; set; }
 
         /// <summary>
         /// 联系人

Edu.Model/Entity/User/RB_Student.cs

@@ -135,7 +135,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 学习目的
         /// </summary>
-        public GuestLearningGoalsEnum StuPurpose { get; set; }
+        public int StuPurpose { get; set; }
 
         /// <summary>
         /// 客人来源
@@ -185,7 +185,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 收客渠道
         /// </summary>
-        public StuChannelEnum StuChannel { get; set; }
+        public int StuChannel { get; set; }
 
         /// <summary>
         /// 第三方平台名称

Edu.Model/ViewModel/Sell/RB_Order_Guest_ViewModel.cs

@@ -268,5 +268,10 @@ namespace Edu.Model.ViewModel.Sell
         /// 学员业务单据列表
         /// </summary>
         public List<RB_Education_Receipt_ViewModel> GuestEduReceiptList { get; set; }
+
+        /// <summary>
+        /// 学习目的
+        /// </summary>
+        public string LearningGoalsName { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/System/RB_Channel_Extend.cs

@@ -10,5 +10,9 @@ namespace Edu.Model.ViewModel.System
     /// </summary>
     public class RB_Channel_Extend : RB_Channel
     {
+        /// <summary>
+        /// 渠道编号【查询使用】
+        /// </summary>
+        public string QChannelIds { get; set;}
     }
 }

Edu.Model/ViewModel/System/RB_LearningGoals_Extend.cs

@@ -10,5 +10,9 @@ namespace Edu.Model.ViewModel.System
     /// </summary>
     public class RB_LearningGoals_Extend : RB_LearningGoals
     {
+        /// <summary>
+        /// 学习目的编号【查询使用】
+        /// </summary>
+        public string QGoalIds { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -239,5 +239,15 @@ namespace Edu.Model.ViewModel.User
         /// 操作类型(1-ERP后台操作，2-App小程序操作)
         /// </summary>
         public int OperateType { get; set; }
+
+        /// <summary>
+        /// 渠道名称
+        /// </summary>
+        public string StuChannelName { get; set; }
+
+        /// <summary>
+        /// 学习目的名称
+        /// </summary>
+        public string StuPurposeName { get; set;}
     }
 }
\ No newline at end of file

Edu.Module.Course/OrderModule.cs

@@ -32,6 +32,7 @@ using Edu.Repository.Log;
 using Edu.Repository.Reserve;
 using Edu.Repository.Sell;
 using Edu.Repository.StudyAbroad;
+using Edu.Repository.System;
 using Edu.Repository.User;
 using Newtonsoft.Json.Linq;
 using System;
@@ -215,6 +216,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Finance_ConfigRepository finance_ConfigRepository = new RB_Finance_ConfigRepository();
 
+        /// <summary>
+        /// 学习目的仓储层对象
+        /// </summary>
+        private readonly RB_LearningGoalsRepository learningGoalsRepository = new RB_LearningGoalsRepository();
+
         #region 日语培训
 
         /// <summary>
@@ -960,7 +966,7 @@ namespace Edu.Module.Course
                         Basics = visitorModel?.LevelType,
                         Education = GuestEducationEnum.N2,
                         GuestSource = demodel.OrderSource,
-                        LearningGoals = GuestLearningGoalsEnum.Love,
+                        LearningGoals =0,
                         Contact = "",
                         ContactMobile = "",
                         Status = 0,
@@ -1008,7 +1014,7 @@ namespace Edu.Module.Course
                         Basics = oldGuestModel?.Basics,
                         Education = oldGuestModel?.Education ?? GuestEducationEnum.N2,
                         GuestSource = demodel.OrderSource,
-                        LearningGoals = oldGuestModel?.LearningGoals ?? GuestLearningGoalsEnum.Love,
+                        LearningGoals = oldGuestModel?.LearningGoals ?? 0,
                         Contact = oldGuestModel?.Contact ?? "",
                         ContactMobile = oldGuestModel?.ContactMobile ?? "",
                         Status = 0,
@@ -1070,7 +1076,7 @@ namespace Edu.Module.Course
                             Basics = "",
                             Education = item?.StuEducation ?? GuestEducationEnum.N2,
                             GuestSource = demodel.OrderSource,
-                            LearningGoals = item?.StuPurpose ?? GuestLearningGoalsEnum.Love,
+                            LearningGoals = item?.StuPurpose ?? 0,
                             Contact = item?.StuContract ?? "",
                             ContactMobile = item?.StuContractMobile ?? "",
                             Status = 0,
@@ -2170,6 +2176,12 @@ namespace Edu.Module.Course
             if (list != null && list.Count > 0)
             {
                 string guestIds = string.Join(",", list.Select(qitem => qitem.Id));
+                string goalIds = string.Join(",", list.Select(qitem => qitem.LearningGoals));
+
+                var goalList= learningGoalsRepository.GetLearningGoalsListRepository(new Model.ViewModel.System.RB_LearningGoals_Extend()
+                {
+                    QGoalIds=goalIds
+                });
                 //查询学员[停课，退课，转班，分拆，临课]业务单据
                 var guestEduReceiptList = education_ReceiptRepository.GetEducationReceiptListExtRepository(new EducationReceiptQuery()
                 {
@@ -2209,6 +2221,7 @@ namespace Edu.Module.Course
                     {
                         item.TargetClassName = sourceTargetList?.Where(qitem => qitem.OrderId == item.TargetOrderId)?.FirstOrDefault()?.ClassName;
                     }
+                    item.LearningGoalsName = goalList?.FirstOrDefault(qitem => qitem.Id == item.LearningGoals)?.Name ?? "";
                 }
             }
             return list;
@@ -2287,7 +2300,9 @@ namespace Edu.Module.Course
 
                 if (gModel.LearningGoals != dmodel.LearningGoals)
                 {
-                    LogContent += "，学习目的由【" + gModel.LearningGoals.ToName() + "】修改为【" + dmodel.LearningGoals.ToName() + "】";
+                    string oldName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(gModel.LearningGoals)?.Name ?? "";
+                    string newName= learningGoalsRepository.GetLearningGoalsExtEntityRepository(dmodel.LearningGoals)?.Name ?? "";
+                    LogContent += "，学习目的由【" + oldName + "】修改为【" + newName + "】";
                 }
                 gModel.LearningGoals = dmodel.LearningGoals;
 

Edu.Module.Course/OrderModule2.cs

@@ -396,7 +396,7 @@ namespace Edu.Module.Course
                     Basics = "",
                     Education = item?.StuEducation ?? GuestEducationEnum.N2,
                     GuestSource = orderModel.OrderSource,
-                    LearningGoals = item?.StuPurpose ?? GuestLearningGoalsEnum.Love,
+                    LearningGoals = item?.StuPurpose ?? 0,
                     Contact = item?.StuContract ?? "",
                     ContactMobile = item?.StuContractMobile ?? "",
                     Status = 0,

Edu.Module.Duty/DutyPlanModule.cs

@@ -1681,7 +1681,7 @@ namespace Edu.Module.Duty
                     StuTel = item.Tel,
                     StuIcon ="",
                     StuSex = 0,
-                    StuChannel = StuChannelEnum.PassBy
+                    StuChannel = 0
                 };
                 if (extModel.StuId == 0)
                 {

Edu.Module.User/StudentModule.cs

@@ -86,6 +86,16 @@ namespace Edu.Module.User
         /// </summary>
         private readonly RB_Student_TypeRepository student_TypeRepository = new RB_Student_TypeRepository();
 
+        /// <summary>
+        /// 学习目的仓储层对象
+        /// </summary>
+        private readonly RB_LearningGoalsRepository learningGoalsRepository = new RB_LearningGoalsRepository();
+
+        /// <summary>
+        /// 渠道仓储层对象
+        /// </summary>
+        private readonly RB_ChannelRepository channelRepository = new RB_ChannelRepository();
+
         /// <summary>
         /// 获取学生列表
         /// </summary>
@@ -206,6 +216,20 @@ namespace Edu.Module.User
                         StuIds = string.Join(",", transIdList)
                     });
                 }
+
+                //学习目的
+                string goalIds = string.Join(",", list.Select(qitem => qitem.StuPurpose));
+                var goalList = learningGoalsRepository.GetLearningGoalsListRepository(new Model.ViewModel.System.RB_LearningGoals_Extend()
+                {
+                    QGoalIds=goalIds
+                });
+
+                string channelIds = string.Join(",", list.Select(qitem => qitem.StuChannel));
+                var channelList = channelRepository.GetChannelListRepository(new Model.ViewModel.System.RB_Channel_Extend()
+                {
+                    QChannelIds=channelIds
+                });
+
                 foreach (var item in list)
                 {
                     var tempOrderList = stuOrderList?.Where(qitem => qitem.Student_Id == item.StuId)?.ToList();
@@ -242,6 +266,9 @@ namespace Edu.Module.User
                     }
                     item.StuStageName = stageList?.FirstOrDefault(qitem => qitem.Id == item.StuStage)?.StageName ?? "";
                     item.StuTypeName = stuTypeList?.FirstOrDefault(qitem => qitem.Id == item.StuType)?.Name ?? "";
+                    item.StuChannelName = channelList?.FirstOrDefault(qitem => qitem.Id == item.StuChannel)?.Name ?? "";
+                    item.StuPurposeName = goalList?.FirstOrDefault(qitem => qitem.Id == item.StuPurpose)?.Name ?? "";
+
                 }
             }
             return list;
@@ -381,6 +408,8 @@ namespace Edu.Module.User
                 extModel.AssistList = assistList;
                 extModel.StuStageName = stageRepository.GetEntity(extModel.StuStage)?.StageName ?? "";
                 extModel.StuTypeName = student_TypeRepository.GetEntity(extModel.StuType)?.Name ?? "";
+                extModel.StuPurposeName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(extModel.StuPurpose)?.Name ?? "";
+                extModel.StuChannelName = channelRepository.GetChannelExtEntityRepository(extModel.StuChannel)?.Name ?? "";
             }
             return extModel;
         }

Edu.Repository/System/RB_ChannelRepository.cs

@@ -74,6 +74,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Channel_Extend.Name));
                     parameters.Add("Name", "%" + query.Name.Trim() + "%");
                 }
+                if (!string.IsNullOrEmpty(query.QChannelIds))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Channel_Extend.Id), query.QChannelIds);
+                }
             }
             return Get<RB_Channel_Extend>(builder.ToString(), parameters).ToList();
         }

Edu.Repository/System/RB_LearningGoalsRepository.cs

@@ -74,6 +74,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_LearningGoals_Extend.Name));
                     parameters.Add("Name", "%" + query.Name.Trim() + "%");
                 }
+                if (!string.IsNullOrEmpty(query.QGoalIds))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_LearningGoals_Extend.Id), query.QGoalIds);
+                }
             }
             return Get<RB_LearningGoals_Extend>(builder.ToString(), parameters).ToList();
         }

Edu.Repository/System/RB_StageRepository.cs

 using Edu.Model.Entity.System;
 using Edu.Model.ViewModel.System;
 using Edu.Common.Enum;
-using Edu.Model.Entity.System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Edu.Repository/User/RB_StudentRepository.cs

@@ -48,6 +48,16 @@ namespace Edu.Repository.User
         /// </summary>
         private readonly RB_Student_TypeRepository student_TypeRepository = new RB_Student_TypeRepository();
 
+        /// <summary>
+        /// 收客渠道仓储层对象
+        /// </summary>
+        private readonly RB_ChannelRepository channelRepository = new RB_ChannelRepository();
+
+        /// <summary>
+        /// 学习目的仓储层对象
+        /// </summary>
+        private readonly RB_LearningGoalsRepository learningGoalsRepository = new RB_LearningGoalsRepository();
+
         /// <summary>
         /// 获取学生列表
         /// </summary>
@@ -345,7 +355,9 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
                 }
                 if (oldModel.StuPurpose != model.StuPurpose)
                 {
-                    logContent += string.Format("学习目的：由【{0}】=>【{1}】,", oldModel.StuPurpose.ToName(), model.StuPurpose.ToName());
+                    string oldName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(oldModel.StuPurpose)?.Name??"" ;
+                    string newName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(model.StuPurpose)?.Name ?? "";
+                    logContent += string.Format("学习目的：由【{0}】=>【{1}】,", oldName, newName);
                 }
                 if (oldModel.StuProfession != model.StuProfession)
                 {
@@ -363,7 +375,9 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
                 }
                 if (oldModel.StuChannel != model.StuChannel)
                 {
-                    logContent += string.Format("收客渠道：由【{0}】=>【{1}】,", oldModel.StuChannel.ToName(), model.StuChannel.ToName());
+                    string oldName = channelRepository.GetChannelExtEntityRepository(oldModel.StuChannel)?.Name ?? "";
+                    string newName= channelRepository.GetChannelExtEntityRepository(model.StuChannel)?.Name ?? "";
+                    logContent += string.Format("收客渠道：由【{0}】=>【{1}】,", oldName, newName);
                 }
                 if (oldModel.PlatformName != model.PlatformName)
                 {

Edu.WebApi/Controllers/Bonus/BonusController.cs

@@ -7,6 +7,7 @@ using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,7 +36,7 @@ namespace Edu.WebApi.Controllers.Bonus
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var query = new RB_Bonus_PlanExtend()
             {
-                 PlanName=base.ParmJObj.GetStringValue("PlanName"),
+                PlanName = base.ParmJObj.GetStringValue("PlanName"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
@@ -72,15 +73,15 @@ namespace Edu.WebApi.Controllers.Bonus
         {
             var query = new RB_Bonus_PlanExtend()
             {
-                Id=base.ParmJObj.GetInt("Id"),
+                Id = base.ParmJObj.GetInt("Id"),
                 PlanName = base.ParmJObj.GetStringValue("PlanName"),
-                BasicSalary=base.ParmJObj.GetDecimal("BasicSalary"),
-                OpenBonus=base.ParmJObj.GetDecimal("OpenBonus"),
-                WorkAgeSalary=base.ParmJObj.GetDecimal("WorkAgeSalary"),
-                ClueNumSalary=base.ParmJObj.GetDecimal("ClueNumSalary"),
-                SaleIds=base.ParmJObj.GetStringValue("SaleIds"),
-                UseCourseIds=base.ParmJObj.GetStringValue("UseCourseIds"),
-                NotUseCourseIds=base.ParmJObj.GetStringValue("NotUseCourseIds"),
+                BasicSalary = base.ParmJObj.GetDecimal("BasicSalary"),
+                OpenBonus = base.ParmJObj.GetDecimal("OpenBonus"),
+                WorkAgeSalary = base.ParmJObj.GetDecimal("WorkAgeSalary"),
+                ClueNumSalary = base.ParmJObj.GetDecimal("ClueNumSalary"),
+                SaleIds = base.ParmJObj.GetStringValue("SaleIds"),
+                UseCourseIds = base.ParmJObj.GetStringValue("UseCourseIds"),
+                NotUseCourseIds = base.ParmJObj.GetStringValue("NotUseCourseIds"),
             };
             query.CreateBy = base.UserInfo.Id;
             query.UpdateBy = base.UserInfo.Id;
@@ -88,6 +89,27 @@ namespace Edu.WebApi.Controllers.Bonus
             query.UpdateTime = DateTime.Now;
             query.Group_Id = base.UserInfo.Group_Id;
             query.Status = Common.Enum.DateStateEnum.Normal;
+            query.DetailList = new List<RB_Bouns_PlanDetail_Extend>();
+            string detailList = base.ParmJObj.GetStringValue("DetailList");
+            if (!string.IsNullOrEmpty(detailList))
+            {
+                JArray jarray = JArray.Parse(detailList);
+                if (jarray != null && jarray.Count > 0)
+                {
+                    foreach (var jItem in jarray)
+                    {
+                        JObject jobj = JObject.Parse(jItem.ToString());
+                        query.DetailList.Add(new RB_Bouns_PlanDetail_Extend()
+                        {
+                            DetailId = jobj.GetInt("DetailId"),
+                            PlanId = jobj.GetInt("PlanId"),
+                            StartNum = jobj.GetDecimal("StartNum"),
+                            EndNum = jobj.GetDecimal("EndNum"),
+                            Money = jobj.GetDecimal("Money"),
+                        });
+                    }
+                }
+            }
             bool flag = bonusConfigModule.SetBonusPlanModule(query);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1119,7 +1119,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.GuestSource,
                 GuestSourceName = x.GuestSource.ToName(),
                 x.LearningGoals,
-                LearningGoalsName = x.LearningGoals.ToName(),
+                x.LearningGoalsName,
                 x.Contact,
                 x.ContactMobile,
                 x.IDCard,
@@ -1189,7 +1189,7 @@ namespace Edu.WebApi.Controllers.Course
                 Basics = base.ParmJObj.GetStringValue("Basics"),
                 Education = (GuestEducationEnum)base.ParmJObj.GetInt("Education"),
                 GuestSource = (OrderSourceEnum)base.ParmJObj.GetInt("GuestSource"),
-                LearningGoals = (GuestLearningGoalsEnum)base.ParmJObj.GetInt("LearningGoals"),
+                LearningGoals = base.ParmJObj.GetInt("LearningGoals"),
                 Contact = base.ParmJObj.GetStringValue("Contact"),
                 ContactMobile = base.ParmJObj.GetStringValue("ContactMobile"),
                 IDCard = base.ParmJObj.GetStringValue("IDCard"),

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -533,7 +533,9 @@ namespace Edu.WebApi.Controllers.Customer
                 x.ApproveStateStr,
                 x.CreateBy,
                 x.CreateByName,
-                x.CreateTimeStr
+                x.CreateTimeStr,
+                x.QQ,
+                x.WeChatNo,
             });
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);

Edu.WebApi/Controllers/User/UserController.cs

@@ -724,7 +724,7 @@ namespace Edu.WebApi.Controllers.User
                     item.CreateType,
                     CreateTypeStr = item.CreateType.ToName(),
                     item.StuChannel,
-                    StuChannelName = item.StuChannel.ToName(),
+                    item.StuChannelName,
                     item.PlatformName,
                     item.CustomerId,
                     item.CustomerName,
@@ -743,7 +743,7 @@ namespace Edu.WebApi.Controllers.User
                     item.StuEducation,
                     StuEducationName = item.StuEducation.ToName(),
                     item.StuPurpose,
-                    StuPurposeName = item.StuPurpose.ToName(),
+                    item.StuPurposeName,
                     item.VisitCount,
                     item.TrialLessonCount,
                     item.StuSourceId,
@@ -810,7 +810,7 @@ namespace Edu.WebApi.Controllers.User
                 JapanBaseInfo = (GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"),
                 StuProfession = base.ParmJObj.GetStringValue("StuProfession"),
                 StuEducation = (GuestEducationEnum)base.ParmJObj.GetInt("StuEducation"),
-                StuPurpose = (GuestLearningGoalsEnum)base.ParmJObj.GetInt("StuPurpose"),
+                StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
                 StuSource = (OrderSourceEnum)base.ParmJObj.GetInt("StuSource"),
                 StuAddress = base.ParmJObj.GetStringValue("StuAddress"),
                 StuContract = base.ParmJObj.GetStringValue("StuContract"),
@@ -818,7 +818,7 @@ namespace Edu.WebApi.Controllers.User
                 StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
                 StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
                 StuStage = base.ParmJObj.GetInt("StuStage"),
-                StuChannel = (StuChannelEnum)base.ParmJObj.GetInt("StuChannel"),
+                StuChannel = base.ParmJObj.GetInt("StuChannel"),
                 PlatformName = base.ParmJObj.GetStringValue("PlatformName"),
                 CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
                 StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
@@ -1043,7 +1043,7 @@ namespace Edu.WebApi.Controllers.User
                 JapanBaseInfo = (GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"),
                 StuProfession = base.ParmJObj.GetStringValue("StuProfession"),
                 StuEducation = (GuestEducationEnum)base.ParmJObj.GetInt("StuEducation"),
-                StuPurpose = (GuestLearningGoalsEnum)base.ParmJObj.GetInt("StuPurpose"),
+                StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
                 StuSource = (OrderSourceEnum)base.ParmJObj.GetInt("StuSource"),
                 StuAddress = base.ParmJObj.GetStringValue("StuAddress"),
                 StuContract = base.ParmJObj.GetStringValue("StuContract"),
@@ -1176,7 +1176,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuEducation,
                 StuEducationName = extModel.StuEducation.ToName(),
                 extModel.StuPurpose,
-                StuPurposeName = extModel.StuPurpose.ToName(),
+                extModel.StuPurposeName,
                 extModel.StuSource,
                 StuSourceName = extModel.StuSource.ToName(),
                 extModel.StuAddress,
@@ -1193,7 +1193,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuStageName,
                 extModel.CreateBy,
                 extModel.StuChannel,
-                StuChannelName = extModel.StuChannel.ToName(),
+                extModel.StuChannelName,
                 extModel.PlatformName,
                 AssistList = extModel?.AssistList ?? new List<RB_Student_Assist_Extend>(),
                 extModel.StuSourceId,