Skip to content

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

页面修改

parent 06539ff9
Show whitespace changes
Inline Side-by-side
Showing with 288 additions and 121 deletions
Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs
View file @ 2eff3079
......@@ -17,6 +17,11 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public string QStudentIds { get; set; }
/// <summary>
/// 订单编号【查询使用】
/// </summary>
public string QOrderIds { get; set; }
/// <summary>
/// 班级名称
/// </summary>
......@@ -133,5 +138,10 @@ namespace Edu.Model.ViewModel.User
/// 预约的次数
/// </summary>
public int AppointNum { get; set; }
/// <summary>
/// 订单创建时间
/// </summary>
public DateTime OrderCreateTime { get; set; }
}
}
Edu.Module.Course/OrderModule.cs
View file @ 2eff3079
......@@ -229,6 +229,11 @@ namespace Edu.Module.Course
private readonly RB_ReturnMoney_BatchRepository returnMoney_BatchRepository = new RB_ReturnMoney_BatchRepository();
/// <summary>
/// 课程顾问跟进仓储层对象
/// </summary>
private readonly RB_Student_AdvisorRepository student_AdvisorRepository = new RB_Student_AdvisorRepository();
#region 日语培训
/// <summary>
......@@ -425,7 +430,7 @@ namespace Edu.Module.Course
/// <param name="uid"></param>
/// <param name="gid"></param>
/// <returns></returns>
public (bool result,string message) SetUserReturnMoneyModule(int type,int uid,int gid)
public (bool result, string message) SetUserReturnMoneyModule(int type, int uid, int gid)
{
//检查本月是否存在操作记录
string month = DateTime.Now.ToString("yyyy-MM");
......@@ -549,12 +554,13 @@ namespace Edu.Module.Course
/// <param name="month"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<RB_ReturnMoney_Batch_ViewModel> GetBatchListModule(int pageIndex, int pageSize, out long count, int type, string month,int groupId)
public List<RB_ReturnMoney_Batch_ViewModel> GetBatchListModule(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
{
var list = returnMoney_BatchRepository.GetPageList(pageIndex, pageSize, out count, type, month, groupId);
if (list.Any())
{
list.ForEach(x => {
list.ForEach(x =>
{
x.CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "";
});
}
......@@ -566,14 +572,15 @@ namespace Edu.Module.Course
var courseModel = courseRepository.GetEntity(courseId);
if (courseModel != null)
{
var sellPrice = courseModel.SellPrice * ((100-(m.CommissionType == 1 ? courseModel.B2CRatio : courseModel.B2CReNewRatio)) / 100);
var sellPrice = courseModel.SellPrice * ((100 - (m.CommissionType == 1 ? courseModel.B2CRatio : courseModel.B2CReNewRatio)) / 100);
if ((int)m.OrderSourceType == 1)
{
if (courseModel.CommissionReType == 1)
{
m.CommissionMoeny = Math.Round(sellPrice * ((m.CommissionType == 1 ? courseModel.B2CRbRatio : courseModel.B2CRNRatio) / 100), 2, MidpointRounding.AwayFromZero);
}
else {
else
{
m.CommissionMoeny = m.CommissionType == 1 ? courseModel.B2CRbRatio : courseModel.B2CRNRatio;
}
m.CommissionReType = m.CommissionType == 1 ? courseModel.B2CRbRatioType.ToInt() : courseModel.B2CRNRatioType.ToInt();
......@@ -589,7 +596,8 @@ namespace Edu.Module.Course
{
m.CommissionMoeny = Math.Round(sellPrice * ((m.CommissionType == 1 ? courseModel.B2BRebateRatio : courseModel.B2BReNewRatio) / 100), 2, MidpointRounding.AwayFromZero);
}
else {
else
{
m.CommissionMoeny = m.CommissionType == 1 ? courseModel.B2BRebateRatio : courseModel.B2BReNewRatio;
}
m.CommissionReType = m.CommissionType == 1 ? courseModel.B2BRebateRatioType.ToInt() : courseModel.B2BReNewRatioType.ToInt();
......@@ -602,7 +610,8 @@ namespace Edu.Module.Course
{
m.CommissionMoeny = Math.Round(sellPrice * ((m.CommissionType == 1 ? courseModel.SchoolRebateRatio : courseModel.SchoolReNewRatio) / 100), 2, MidpointRounding.AwayFromZero);
}
else {
else
{
m.CommissionMoeny = m.CommissionType == 1 ? courseModel.SchoolRebateRatio : courseModel.SchoolReNewRatio;
}
m.CommissionReType = m.CommissionType == 1 ? courseModel.SchoolRebateRatioType.ToInt() : courseModel.SchoolReNewRatioType.ToInt();
......@@ -616,7 +625,8 @@ namespace Edu.Module.Course
{
m.CommissionMoeny = Math.Round(sellPrice * ((m.CommissionType == 1 ? courseModel.InnerRecommendRatio : courseModel.InnerRecommendReNewRatio) / 100), 2, MidpointRounding.AwayFromZero);
}
else {
else
{
m.CommissionMoeny = m.CommissionType == 1 ? courseModel.InnerRecommendRatio : courseModel.InnerRecommendReNewRatio;
}
m.CommissionReType = m.CommissionType == 1 ? courseModel.InnerRecommendRatioType.ToInt() : courseModel.InnerRecommendReNewRatioType.ToInt();
......@@ -629,7 +639,8 @@ namespace Edu.Module.Course
{
m.CommissionMoeny = Math.Round(sellPrice * ((m.CommissionType == 1 ? (courseModel.TransIntroductceRatio) : courseModel.TransIntroductceReNewRatio) / 100), 2, MidpointRounding.AwayFromZero);
}
else {
else
{
m.CommissionMoeny = m.CommissionType == 1 ? (courseModel.TransIntroductceRatio) : courseModel.TransIntroductceReNewRatio;
}
m.CommissionReType = m.CommissionType == 1 ? courseModel.TransIntroductceRatioType.ToInt() : courseModel.TransIntroductceReNewRatioType.ToInt();
......@@ -714,7 +725,8 @@ namespace Edu.Module.Course
demodel.InnerRecommendReNewRatio = courseModel.InnerRecommendReNewRatio;
demodel.CommissionReType = courseModel.CommissionReType;
}
else {
else
{
//使用订单的比例
courseModel.B2CRatio = orderModel.B2CRatio;
courseModel.B2CReNewRatio = orderModel.B2CReNewRatio;
......@@ -729,6 +741,7 @@ namespace Edu.Module.Course
courseModel.CommissionReType = orderModel.CommissionReType;
}
#endregion
#region 计算订单优惠信息
List<RB_Student_ViewModel> StuList = new List<RB_Student_ViewModel>();
//计算续费订单优惠
......@@ -788,7 +801,8 @@ namespace Edu.Module.Course
return false;
}
}
else if (demodel.OrderIdentify == 2 && demodel.OrderId > 0) {
else if (demodel.OrderIdentify == 2 && demodel.OrderId > 0)
{
//直接验证优惠金额
decimal DiscountMoney = coursePrice * (courseModel.B2CRatio / 100);
//HK 2022-02-08修改
......@@ -819,6 +833,7 @@ namespace Edu.Module.Course
#endregion
}
#endregion
if (demodel.OrderSource == OrderSourceEnum.EduClient || demodel.OrderSource == OrderSourceEnum.Client)
{
if (demodel.OrderSource == OrderSourceEnum.EduClient)
......@@ -933,7 +948,8 @@ namespace Edu.Module.Course
#region 验证学生名单数量
var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = GuestStateEnum.Normal });
if (glist.Any() && orderModel.CustomerId != demodel.CustomerId) {
if (glist.Any() && orderModel.CustomerId != demodel.CustomerId)
{
message = "订单已创建学生名单，无法修改其同行";
return false;
}
......@@ -969,6 +985,7 @@ namespace Edu.Module.Course
{ nameof(RB_Order_ViewModel.CourseConsultantId),demodel.CourseConsultantId},
};
flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
#region 记录日志信息
LogContent = $"修改日语培训订单【{demodel.OrderId}】";
if (orderModel.GuestNum != demodel.GuestNum)
......@@ -1087,6 +1104,40 @@ namespace Edu.Module.Course
SaleRemark = demodel.SaleRemark;
}
#region 添加学员初次成交/多次成交时间
if (StuList != null && StuList.Count > 0)
{
string stuIds = string.Join(",", StuList.Select(qitem => qitem.StuId));
List<RB_Student_Advisor_Extend> advisorList = new List<RB_Student_Advisor_Extend>();
if (!string.IsNullOrEmpty(stuIds))
{
advisorList = student_AdvisorRepository.GetStudentAdvisorListRepository(new RB_Student_Advisor_Extend()
{
QStuIds = stuIds
});
}
foreach (var sItem in StuList)
{
var tempAdv = advisorList.Where(qitem => qitem.AdvisorStatus == 5)?.FirstOrDefault();
if (tempAdv == null)
{
student_AdvisorRepository.Insert(new Model.Entity.Customer.RB_Student_Advisor()
{
Id=0,
StuId=sItem.StuId,
AdvisorStatus=5,
AdvisorDate=Common.ConvertHelper.FormatDate(DateTime.Now),
AdvisorRemark="新增订单,系统自动添加!",
CreateBy=demodel.CreateBy,
CreateTime=DateTime.Now,
Group_Id=demodel.Group_Id,
});
}
}
}
#endregion
#region 预约单转订单
//预约单转订单
if (flag && demodel.VisitorReserveId > 0)
......@@ -1114,7 +1165,7 @@ namespace Edu.Module.Course
Basics = visitorModel?.LevelType,
Education = GuestEducationEnum.N2,
GuestSource = demodel.OrderSource,
LearningGoals =0,
LearningGoals = 0,
Contact = "",
ContactMobile = "",
Status = 0,
......@@ -1207,10 +1258,12 @@ namespace Edu.Module.Course
#region 续费 学员介绍
RB_Student_ViewModel stuModel = null;
var sogModel = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel() { GuestId = demodel.OldGuestId }).FirstOrDefault();
if (sogModel != null) {
if (sogModel != null)
{
stuModel = studentRepository.GetEntity<RB_Student_ViewModel>(sogModel.Student_Id);
}
if (stuModel != null && (demodel.RenewOrderId > 0 || (stuModel.CreateType == StuCreateTypeEnum.TransIntroduction && stuModel.StuSourceId > 0))) {
if (stuModel != null && (demodel.RenewOrderId > 0 || (stuModel.CreateType == StuCreateTypeEnum.TransIntroduction && stuModel.StuSourceId > 0)))
{
int month = 1;
if (stuModel.FirstEnrollDate.HasValue)
......@@ -1255,9 +1308,11 @@ namespace Edu.Module.Course
#endregion
#region 插入学生名单(客户选择转订单)
if (flag && demodel.OrderIdentify == 2) {
if (flag && demodel.OrderIdentify == 2)
{
int MaxChapterNo = courseRepository.GetMaxChapterNum(demodel.CourseId, demodel.Group_Id);
foreach (var item in StuList) {
foreach (var item in StuList)
{
var guestModel = new RB_Order_Guest_ViewModel()
{
Id = 0,
......@@ -1297,8 +1352,8 @@ namespace Edu.Module.Course
StuIcon = item.StuIcon,
TotalHours = Convert.ToInt32(courseModel.ClassHours),
RenewState = item.IsRenewGuest == 1 ? 2 : 1,
QQ=item.QQ,
WeChatNo=item.WeChatNo,
QQ = item.QQ,
WeChatNo = item.WeChatNo,
TotalChapterNo = MaxChapterNo
};
SetOrderGuestInfo(guestModel, out string Nmessage);
......@@ -1360,7 +1415,8 @@ namespace Edu.Module.Course
#endregion
#region 更新首次报名时间
if (item.IsRenewGuest != 1) {
if (item.IsRenewGuest != 1)
{
//非续费 更新首次报名
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Student_ViewModel.FirstEnrollDate), DateTime.Now}
......@@ -1430,7 +1486,8 @@ namespace Edu.Module.Course
#endregion
#region 更新客人协助人员
if (demodel.OrderIdentify == 2 && (demodel.HelpEnterId > 0 || demodel.CourseConsultantId > 0)) {
if (demodel.OrderIdentify == 2 && (demodel.HelpEnterId > 0 || demodel.CourseConsultantId > 0))
{
//客户转订单这种适配
int StuId = StuList.FirstOrDefault().StuId;
//更新协助人员
......@@ -1438,9 +1495,11 @@ namespace Edu.Module.Course
{
StuId = StuId
});
if (demodel.HelpEnterId > 0) {
if (demodel.HelpEnterId > 0)
{
var assModel = list.Where(x => x.AssistType == Common.Enum.User.AssistTypeEnum.Teacher).FirstOrDefault();
if (assModel == null) {
if (assModel == null)
{
student_AssistRepository.Insert(new Model.Entity.Customer.RB_Student_Assist()
{
Id = 0,
......@@ -1454,7 +1513,8 @@ namespace Edu.Module.Course
}
}
//更新课程顾问
if (demodel.CourseConsultantId > 0) {
if (demodel.CourseConsultantId > 0)
{
var assModel = list.Where(x => x.AssistType == Common.Enum.User.AssistTypeEnum.CourseAdviser).FirstOrDefault();
if (assModel == null)
{
......@@ -1547,6 +1607,9 @@ namespace Edu.Module.Course
}
}
#endregion
return flag;
}
......@@ -1722,7 +1785,7 @@ namespace Edu.Module.Course
else
{
LogContent = "新增留学就业订单";
SaleRemark= demodel.SaleRemark;
SaleRemark = demodel.SaleRemark;
if (studyModel.SaleState != Common.Enum.Sale.SaleStateEnum.Sell)
{
flag = false;
......@@ -1782,7 +1845,7 @@ namespace Edu.Module.Course
RenewState = 1,
QQ = item.QQ,
WeChatNo = item.WeChatNo,
StudentId=item.StuId
StudentId = item.StuId
};
SetOrderGuestInfo(guestModel, out string Nmessage);
}
......@@ -2519,9 +2582,9 @@ namespace Edu.Module.Course
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()
var goalList = learningGoalsRepository.GetLearningGoalsListRepository(new Model.ViewModel.System.RB_LearningGoals_Extend()
{
QGoalIds=goalIds
QGoalIds = goalIds
});
//查询学员[停课，退课，转班，分拆，临课]业务单据
var guestEduReceiptList = education_ReceiptRepository.GetEducationReceiptListExtRepository(new EducationReceiptQuery()
......@@ -2641,7 +2704,7 @@ namespace Edu.Module.Course
if (gModel.LearningGoals != dmodel.LearningGoals)
{
string oldName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(gModel.LearningGoals)?.Name ?? "";
string newName= learningGoalsRepository.GetLearningGoalsExtEntityRepository(dmodel.LearningGoals)?.Name ?? "";
string newName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(dmodel.LearningGoals)?.Name ?? "";
LogContent += "，学习目的由【" + oldName + "】修改为【" + newName + "】";
}
gModel.LearningGoals = dmodel.LearningGoals;
......@@ -2739,9 +2802,11 @@ namespace Edu.Module.Course
else
{
#region 验证电话是否已是他人客户
if (!string.IsNullOrEmpty(dmodel.Mobile)) {
if (!string.IsNullOrEmpty(dmodel.Mobile))
{
var slist = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = dmodel.Group_Id, StuTel = dmodel.Mobile, School_Id = -1 });
if (slist.Where(x => x.CustomerId != ordermodel.CustomerId).Any()) {
if (slist.Where(x => x.CustomerId != ordermodel.CustomerId).Any())
{
message = "学员'" + dmodel.GuestName + "'已被他人注册";
return false;
}
......@@ -2761,7 +2826,7 @@ namespace Edu.Module.Course
}
#region 新增修改学员账号
if (flag )
if (flag)
{
RB_Student_ViewModel stuModel = null;
if ((dmodel?.StudentId ?? 0) > 0)
......@@ -2769,7 +2834,7 @@ namespace Edu.Module.Course
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
StuId= dmodel?.StudentId??0
StuId = dmodel?.StudentId ?? 0
});
}
else
......@@ -2817,7 +2882,7 @@ namespace Edu.Module.Course
Group_Id = dmodel.Group_Id,
IsDisable = 1,
ProviceId = 0,
School_Id = (classmodel?.School_Id??0),
School_Id = (classmodel?.School_Id ?? 0),
Status = DateStateEnum.Normal,
StuBirth = dmodel.BirthDate,
StuIcon = dmodel.StuIcon,
......@@ -3083,7 +3148,7 @@ namespace Edu.Module.Course
}
#region 新增修改学员账号
if (flag&& isAdd)
if (flag && isAdd)
{
RB_Student_ViewModel stuModel = null;
if (!string.IsNullOrEmpty(dmodel.Mobile))
......@@ -3204,11 +3269,14 @@ namespace Edu.Module.Course
/// <returns></returns>
public bool DelOrderGuestInfo(int guestId, UserInfo userInfo)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order_Guest_ViewModel.Status),1}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Order_Guest_ViewModel.Id),
FiledValue=guestId,
OperatorEnum=OperatorEnum.Equal
......@@ -3218,22 +3286,6 @@ namespace Edu.Module.Course
if (flag)
{
var gmodel = order_GuestRepository.GetEntity(guestId);
//查询学生账号
//var sModel = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel() { OrderId = gmodel?.OrderId ?? 0, GuestId = guestId }).FirstOrDefault();
//if (sModel != null) {
// //更新账号表
// Dictionary<string, object> valuePairs = new Dictionary<string, object>() {
// { nameof(RB_Account_ViewModel.Status),DateStateEnum.Delete}
// };
// List<WhereHelper> wheres1 = new List<WhereHelper>() {
// new WhereHelper(){
// FiledName=nameof(RB_Account_ViewModel.Id),
// FiledValue=sModel.Account_Id,
// OperatorEnum=OperatorEnum.Equal
// }
// };
// accountRepository.Update(valuePairs, wheres1);
//}
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
......@@ -3292,7 +3344,7 @@ namespace Edu.Module.Course
{
string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
//学员信息
List<RB_Student_ViewModel> stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { QOrderIds = orderIds },isQueryCreateType:true);
List<RB_Student_ViewModel> stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { QOrderIds = orderIds }, isQueryCreateType: true);
List<int> idList = new List<int>();
List<RB_Order_ViewModel> sourceTargetList = new List<RB_Order_ViewModel>();
......@@ -3489,11 +3541,14 @@ namespace Edu.Module.Course
if (teacherModel.AccountType != Common.Enum.User.AccountTypeEnum.Teacher) { return "所选账号不是教师端，无法关联"; }
NewName = teacherModel?.EmployeeName ?? "";
}
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order.HelpEnterId),helpEnterId}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Order.OrderId),
FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal
......@@ -3914,10 +3969,12 @@ namespace Edu.Module.Course
//如果有效课时与总课时相等代表款已收完，更新佣金为可发放状态
if (gmodel.TotalHours <= validClassHours)
{
var studentMapping = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel() {
var studentMapping = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel()
{
GuestId = guestId
});
if (studentMapping.Any()) {
if (studentMapping.Any())
{
UpdateReturnMoneyStatus(studentMapping.First().Student_Id, gmodel.OrderId);
}
......@@ -3931,7 +3988,7 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="stuId"></param>
/// <param name="orderId"></param>
private void UpdateReturnMoneyStatus(int stuId,int orderId)
private void UpdateReturnMoneyStatus(int stuId, int orderId)
{
var model = returnComissionRepository.GetModelByOrderIdStuId(orderId, stuId);
if (model != null && model.Status == -1)
......@@ -3967,7 +4024,8 @@ namespace Edu.Module.Course
};
userReturnComissionRepository.Update(userKeyValues, userWheres);
}
else {
else
{
userModel = new RB_User_ReturnComission_ViewModel()
{
UserId = model.OrderSourceId,
......@@ -4547,5 +4605,60 @@ namespace Edu.Module.Course
#endregion
/// <summary>
/// 初始化课程顾问跟踪状态
/// </summary>
public void RunStudentadvisorModule()
{
var orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel()
{
StartTime = "2022-02-15",
OrderState = OrderStateEnum.Normal
});
if (orderList != null && orderList.Count > 0)
{
string qOrderIds = string.Join(",", orderList.Select(qitem => qitem.OrderId));
if (!string.IsNullOrEmpty(qOrderIds))
{
var stuOrderList = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel() { QOrderIds = qOrderIds });
var advList = new List<RB_Student_Advisor_Extend>();
if (stuOrderList != null && stuOrderList.Count > 0)
{
string stuIds = string.Join(",", stuOrderList.Select(qitem => qitem.Student_Id));
if (!string.IsNullOrEmpty(stuIds))
{
advList = student_AdvisorRepository.GetStudentAdvisorListRepository(new RB_Student_Advisor_Extend() { QStuIds = stuIds });
}
}
foreach (var item in orderList)
{
var tempStuList = stuOrderList?.Where(qitem => qitem.OrderId == item.OrderId)?.ToList();
if (tempStuList != null && tempStuList.Count > 0)
{
foreach (var subItem in tempStuList)
{
var tempAdv = advList?.Where(qitem => qitem.StuId == subItem.Student_Id && qitem.AdvisorStatus == 5)?.FirstOrDefault();
if (tempAdv == null)
{
student_AdvisorRepository.Insert(new Model.Entity.Customer.RB_Student_Advisor()
{
Id = 0,
StuId = subItem.Student_Id,
AdvisorDate = Common.ConvertHelper.FormatDate(item.CreateTime),
AdvisorRemark = "新增订单,系统自动添加!",
AdvisorStatus = 5,
CreateBy = item.CreateBy,
CreateTime = item.CreateTime,
Group_Id = item.Group_Id
});
}
}
}
}
}
}
}
}
}
\ No newline at end of file
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ 2eff3079
......@@ -99,6 +99,14 @@ namespace Edu.Repository.Sell
{
where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} >='{demodel.ConfirmSTime}'";
}
if (!string.IsNullOrEmpty(demodel.StartTime))
{
where += $@" and o.{nameof(RB_Order_ViewModel.CreateTime)} >='{demodel.StartTime}'";
}
if (!string.IsNullOrEmpty(demodel.EndTime))
{
where += $@" and o.{nameof(RB_Order_ViewModel.CreateTime)} <='{demodel.EndTime} 23:59:59'";
}
if (!string.IsNullOrEmpty(demodel.ConfirmETime))
{
where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} <='{demodel.ConfirmETime} 23:59:59'";
......
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ 2eff3079
......@@ -41,6 +41,10 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.OrderId);
}
if (!string.IsNullOrEmpty(query.QOrderIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.QOrderIds);
}
if (query.GuestId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.GuestId), query.GuestId);
......@@ -72,7 +76,8 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus,IFNULL(D.RenewState,0) AS RenewState
,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus
,IFNULL(D.RenewState,0) AS RenewState,C.CreateTime AS OrderCreateTime
FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
......@@ -109,12 +114,13 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
}
}
string sql = string.Format(@"
SELECT A.Student_Id,A.OrderId,A.OrderState,A.RenewState FROM
SELECT A.Student_Id,A.OrderId,A.OrderState,A.RenewState,A.OrderCreateTime
FROM
(
{0}
) AS A
GROUP BY A.Student_Id,A.OrderId
",builder.ToString());
", builder.ToString());
return Get<RB_Student_OrderGuest_ViewModel>(sql).ToList();
}
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 2eff3079
......@@ -89,7 +89,7 @@ namespace Edu.WebApi.Controllers.Course
x.ClassStyle,
ClassStyleName = x.ClassStyle.ToName(),
OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"),
EndOrderTime =Common.ConvertHelper.FormatDate2(x.EndOrderTime),
EndOrderTime = Common.ConvertHelper.FormatDate2(x.EndOrderTime),
IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0,
OriginalPrice = x.CourseOriginalPrice,
SellPrice = x.CourseSellPrice,
......@@ -466,11 +466,11 @@ namespace Edu.WebApi.Controllers.Course
{
ClassId = parms.GetInt("ClassId", 0),
OrderId = parms.GetInt("OrderId"),
SourceId=parms.GetInt("SourceId"),
SourceId = parms.GetInt("SourceId"),
Group_Id = base.UserInfo.Group_Id,
OrderState = OrderStateEnum.Normal
};
if (query.ClassId <= 0&&query.SourceId<=0)
if (query.ClassId <= 0 && query.SourceId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -493,7 +493,8 @@ namespace Edu.WebApi.Controllers.Course
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderGuestRenewState() {
public ApiResult GetOrderGuestRenewState()
{
var userInfo = base.UserInfo;
string StuIds = base.ParmJObj.GetStringValue("StuIds");
if (string.IsNullOrEmpty(StuIds))
......@@ -581,17 +582,21 @@ namespace Edu.WebApi.Controllers.Course
{
return ApiResult.ParamIsNull("请传递选择客户");
}
if (demodel.OrderIdentify == 2 && !string.IsNullOrEmpty(demodel.StuIds)) {
if (demodel.OrderIdentify == 2 && !string.IsNullOrEmpty(demodel.StuIds))
{
//验证学生是否已有其他订单
var vlist = orderModule.ValidataStuOrder(demodel.StuIds, userInfo.Group_Id);
if (vlist.Any()) {
if (vlist.Any())
{
var vmodel = vlist.FirstOrDefault();
return ApiResult.Tip("学员" + vmodel.GuestName + "存在有效未付款订单" + vmodel.OrderId + "，请取消该订单后再试", vmodel.OrderId);
}
}
if (!string.IsNullOrEmpty(demodel.StuIds)) {
if (!string.IsNullOrEmpty(demodel.StuIds))
{
int gNum = JsonHelper.DeserializeObject<List<int>>("[" + demodel.StuIds + "]").Count();
if (demodel.GuestNum != gNum) {
if (demodel.GuestNum != gNum)
{
return ApiResult.ParamIsNull("客人数量不正确");
}
}
......@@ -600,7 +605,7 @@ namespace Edu.WebApi.Controllers.Course
demodel.School_Id = userInfo.School_Id;
demodel.Dept_Id = userInfo.DeptId;
demodel.OrderForm = OrderFormEnum.Computer;
if (demodel.OrderType== OrderTypeEnum.CourseOrder && demodel.OrderIdentify != 2)
if (demodel.OrderType == OrderTypeEnum.CourseOrder && demodel.OrderIdentify != 2)
{
demodel.EnterID = userInfo.Id; //由前端传递了， 可能会不存在 （此字段为市场人员）
}
......@@ -992,7 +997,7 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult GetGuestEducationEnumList()
{
var list = EnumHelper.EnumToList(typeof(GuestEducationEnum));
return ApiResult.Success(data:list);
return ApiResult.Success(data: list);
}
/// <summary>
......@@ -1128,7 +1133,7 @@ namespace Edu.WebApi.Controllers.Course
{
OrderId = base.ParmJObj.GetInt("OrderId"),
ClassId = base.ParmJObj.GetInt("ClassId"),
GuestState =(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
GuestState = (GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
GuestName = base.ParmJObj.GetStringValue("GuestName"),
SourceId = base.ParmJObj.GetInt("SourceId"),
};
......@@ -1145,7 +1150,7 @@ namespace Edu.WebApi.Controllers.Course
SexStr = x.Sex == 1 ? "男" : "女",
x.Age,
BirthDate = Common.ConvertHelper.FormatDate(x.BirthDate),
Mobile=x.StuTel,
Mobile = x.StuTel,
x.Basics,
x.Education,
EducationName = x.Education.ToName(),
......@@ -1189,7 +1194,7 @@ namespace Edu.WebApi.Controllers.Course
x.ValidClassHours,
x.CompleteHours,
x.MakeUpHours,
SurplusHours=x.TotalHours-x.CompleteHours,
SurplusHours = x.TotalHours - x.CompleteHours,
x.GuestState,
x.GuestStateStr,
GraduationTime = Common.ConvertHelper.FormatDate(x.GraduationTime),
......@@ -1302,15 +1307,18 @@ namespace Edu.WebApi.Controllers.Course
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetMyStudentToGuest() {
public ApiResult SetMyStudentToGuest()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);//订单
string StuIds = parms.GetStringValue("StuIds");//学生Ids
if (OrderId <= 0) {
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("订单不存在");
}
if (string.IsNullOrEmpty(StuIds)) {
if (string.IsNullOrEmpty(StuIds))
{
return ApiResult.ParamIsNull("请选择学生");
}
......@@ -1319,7 +1327,8 @@ namespace Edu.WebApi.Controllers.Course
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -1352,7 +1361,7 @@ namespace Edu.WebApi.Controllers.Course
Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
};
demodel.Group_Id = userInfo.Group_Id;
demodel.CreateBy = userInfo.Id;
......@@ -1551,7 +1560,7 @@ namespace Edu.WebApi.Controllers.Course
ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
CustomerId = base.ParmJObj.GetInt("CustomerId", 0),
CategoryId=base.ParmJObj.GetInt("CategoryId"),
CategoryId = base.ParmJObj.GetInt("CategoryId"),
};
demodel.Group_Id = userInfo.Group_Id;
......
Edu.WebApi/Controllers/User/LoginController.cs
View file @ 2eff3079
......@@ -68,8 +68,7 @@ namespace Edu.WebApi.Controllers.User
[AllowAnonymous]
public ApiResult Test()
{
//courseModule.RunWordsUrlModule();
new OrderModule().RunStudentadvisorModule();
return ApiResult.Success();
}
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 2eff3079
......@@ -831,17 +831,39 @@ namespace Edu.WebApi.Controllers.User
StuType = base.ParmJObj.GetInt("StuType"),
ExistCourseConsultant = base.ParmJObj.GetInt("ExistCourseConsultant"),
CategoryId = base.ParmJObj.GetInt("CategoryId"),
QStudentStatus = base.ParmJObj.GetInt("QStudentStatus"),
AdvisorStatus = base.ParmJObj.GetInt("AdvisorStatus"),
StuChannel = base.ParmJObj.GetInt("StuChannel"),
CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
};
if (query.IsQueryMyStu == 1)
{
query.CreateBy = base.UserInfo.Id;
}
string CreateIds = base.ParmJObj.GetStringValue("CreateIds");
if (!string.IsNullOrEmpty(CreateIds))
{
query.CreateIds = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(CreateIds);
}
if (query.BelongType == 1)
{
var tempList = okrPeriodModule.GetOKRPersonalDimensionListModule(base.UserInfo.Group_Id, base.UserInfo.Id, base.UserInfo.DeptId);
string QCreateBys = "";
if (tempList != null && tempList.Count > 0)
{
foreach (var jItem in tempList)
{
JObject jObj = JObject.Parse(JsonHelper.Serialize(jItem));
QCreateBys += jObj.GetStringValue("Id") + ",";
}
}
if (!string.IsNullOrEmpty(QCreateBys))
{
query.QCreateBys = QCreateBys.TrimStart(',').TrimEnd(',');
}
}
int PlanId = base.ParmJObj.GetInt("PlanId");
if (PlanId > 0)
......
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