Skip to content

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

页面修改

parent d2102905
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 23 deletions
Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs
View file @ 39d4ac05
...@@ -182,5 +182,15 @@ namespace Edu.Model.ViewModel.Course ...@@ -182,5 +182,15 @@ namespace Edu.Model.ViewModel.Course
/// 销售平台 /// 销售平台
/// </summary> /// </summary>
public string Saleplat { get; set; } public string Saleplat { get; set; }
/// <summary>
/// 课程售价
/// </summary>
public decimal CourseSellPrice { get; set; }
/// <summary>
/// 课程原价
/// </summary>
public decimal CourseOriginalPrice { get; set; }
} }
} }
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs
View file @ 39d4ac05
...@@ -120,5 +120,10 @@ namespace Edu.Model.ViewModel.Course ...@@ -120,5 +120,10 @@ namespace Edu.Model.ViewModel.Course
/// 留学就业产品名称 /// 留学就业产品名称
/// </summary> /// </summary>
public string StudyName { get; set; } public string StudyName { get; set; }
/// <summary>
/// 协助人员姓名
/// </summary>
public string HelpEnterName { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/OrderModule.cs
View file @ 39d4ac05
...@@ -67,6 +67,16 @@ namespace Edu.Module.Course ...@@ -67,6 +67,16 @@ namespace Edu.Module.Course
/// </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_CourseRepository courseRepository = new RB_CourseRepository();
/// <summary>
/// 课程优惠仓储层对象
/// </summary>
private readonly RB_Course_PreferentialRepository course_PreferentialRepository = new RB_Course_PreferentialRepository();
/// <summary> /// <summary>
/// 教师 /// 教师
/// </summary> /// </summary>
...@@ -222,6 +232,81 @@ namespace Edu.Module.Course ...@@ -222,6 +232,81 @@ namespace Edu.Module.Course
{ {
bool flag = false; bool flag = false;
message = ""; message = "";
//查询班级信息
var classModel = classRepository.GetEntity(demodel.ClassId);
var courseModel = courseRepository.GetEntity(classModel.CouseId);
if (classModel == null)
{
flag = false;
message = "班级不存在";
return flag;
}
#region 计算订单优惠信息
//获取课程优惠
var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
{
CourseId = classModel.CouseId
});
if (demodel.IsLessPrice == 1 && demodel.LessPrice > 0)
{
if (coursePreferentialList != null && coursePreferentialList.Count > 0)
{
var disModel = new RB_Course_Preferential_Extend();
if (demodel.GuestNum == 1)
{
disModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault();
}
if (demodel.GuestNum >= 2)
{
disModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault();
}
decimal disMoney = 0;
var saleCommissionType = disModel?.SaleCommissionType ?? 0;
if (saleCommissionType == 0)
{
var tempMoney = (courseModel?.SellPrice ?? 0) * (disModel?.SaleCommissionMoney ?? 0);
disMoney = tempMoney / Convert.ToDecimal(100);
}
else
{
disMoney = disModel?.SaleCommissionMoney ?? 0;
}
if (demodel.LessPrice > disMoney)
{
message = string.Format("优惠金额不能大于{0}", disMoney.ToString("0.00"));
return flag;
}
}
else
{
message = "此课程未配置【优惠/少价】信息，请通知OP在课程里面添加优惠信息!";
return flag;
}
}
if (demodel.OrderSource == OrderSourceEnum.EduClient || demodel.OrderSource == OrderSourceEnum.Client)
{
if (demodel.OrderSource == OrderSourceEnum.EduClient)
{
demodel.GeneralOccupation = "";
}
else if (demodel.OrderSource == OrderSourceEnum.Client)
{
demodel.EduOccupation = "";
}
}
else
{
demodel.EduOccupation = "";
demodel.GeneralOccupation = "";
}
if (demodel.IsLessPrice == 0)
{
demodel.LessPrice = 0;
}
#endregion
if (demodel.OrderId > 0) if (demodel.OrderId > 0)
{ {
var orderModel = orderRepository.GetEntity(demodel.OrderId); var orderModel = orderRepository.GetEntity(demodel.OrderId);
...@@ -237,7 +322,7 @@ namespace Edu.Module.Course ...@@ -237,7 +322,7 @@ namespace Edu.Module.Course
message = "取消订单无法修改"; message = "取消订单无法修改";
return flag; return flag;
} }
var classModel = classRepository.GetEntity(orderModel.ClassId);
if (classModel == null) if (classModel == null)
{ {
flag = false; flag = false;
...@@ -275,7 +360,7 @@ namespace Edu.Module.Course ...@@ -275,7 +360,7 @@ namespace Edu.Module.Course
message = "成交单价不能小于最低价格"; message = "成交单价不能小于最低价格";
return flag; return flag;
} }
if (demodel.PreferPrice != demodel.Unit_Price * demodel.GuestNum) if (demodel.PreferPrice != (demodel.Unit_Price * demodel.GuestNum-demodel.LessPrice))
{ {
flag = false; flag = false;
message = "应收总额不正确"; message = "应收总额不正确";
...@@ -287,7 +372,12 @@ namespace Edu.Module.Course ...@@ -287,7 +372,12 @@ namespace Edu.Module.Course
{ nameof(RB_Order_ViewModel.Unit_Price),demodel.Unit_Price}, { nameof(RB_Order_ViewModel.Unit_Price),demodel.Unit_Price},
{ nameof(RB_Order_ViewModel.PreferPrice),demodel.PreferPrice}, { nameof(RB_Order_ViewModel.PreferPrice),demodel.PreferPrice},
{ nameof(RB_Order_ViewModel.OrderSource),demodel.OrderSource}, { nameof(RB_Order_ViewModel.OrderSource),demodel.OrderSource},
{ nameof(RB_Order_ViewModel.SaleRemark),demodel.SaleRemark} { nameof(RB_Order_ViewModel.SaleRemark),demodel.SaleRemark},
{ nameof(RB_Order_ViewModel.HelpEnterId),demodel.HelpEnterId},
{ nameof(RB_Order_ViewModel.GeneralOccupation),demodel.GeneralOccupation},
{ nameof(RB_Order_ViewModel.EduOccupation),demodel.EduOccupation},
{ nameof(RB_Order_ViewModel.IsLessPrice),demodel.IsLessPrice},
{ nameof(RB_Order_ViewModel.LessPrice),demodel.LessPrice},
}; };
flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId)); flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
if (flag) if (flag)
...@@ -310,6 +400,27 @@ namespace Edu.Module.Course ...@@ -310,6 +400,27 @@ namespace Edu.Module.Course
{ {
LogContent += $"，客人来源由【{orderModel.OrderSource.ToName()}】修改为【{demodel.OrderSource.ToName()}】"; LogContent += $"，客人来源由【{orderModel.OrderSource.ToName()}】修改为【{demodel.OrderSource.ToName()}】";
} }
if (orderModel.HelpEnterId != demodel.HelpEnterId)
{
var empList= accountRepository.GetAccountListRepository(new RB_Account_ViewModel() { QIds = orderModel.HelpEnterId + "," + demodel.HelpEnterId });
LogContent += $"，协助人员由【{empList?.Where(qitem=>qitem.Id== orderModel.HelpEnterId)?.FirstOrDefault()?.AccountName}】修改为【{empList?.Where(qitem => qitem.Id == demodel.HelpEnterId)?.FirstOrDefault()?.AccountName}】";
}
if (orderModel.GeneralOccupation != demodel.GeneralOccupation)
{
LogContent += $"，一般同行由【{orderModel.GeneralOccupation}】修改为【{demodel.GeneralOccupation}】";
}
if (orderModel.EduOccupation != demodel.EduOccupation)
{
LogContent += $"，教育同行由【{orderModel.EduOccupation}】修改为【{demodel.EduOccupation}】";
}
if (orderModel.IsLessPrice != demodel.IsLessPrice)
{
LogContent += $"，少价由【{(orderModel.IsLessPrice>0?"少价":"不少价")}】修改为【{(demodel.IsLessPrice > 0 ? "少价" : "不少价")}】";
}
if (orderModel.LessPrice != demodel.LessPrice)
{
LogContent += $"，少价金额由【{(orderModel.LessPrice)}】修改为【{(demodel.LessPrice)}】";
}
//记录订单备注 //记录订单备注
if (orderModel.SaleRemark != demodel.SaleRemark) if (orderModel.SaleRemark != demodel.SaleRemark)
{ {
...@@ -339,14 +450,6 @@ namespace Edu.Module.Course ...@@ -339,14 +450,6 @@ namespace Edu.Module.Course
} }
else else
{ {
//查询班级信息
var classModel = classRepository.GetEntity(demodel.ClassId);
if (classModel == null)
{
flag = false;
message = "班级不存在";
return flag;
}
if (classModel.ClassStatus != Common.Enum.Course.ClassStatusEnum.NonOpenClass) if (classModel.ClassStatus != Common.Enum.Course.ClassStatusEnum.NonOpenClass)
{ {
flag = false; flag = false;
...@@ -366,8 +469,8 @@ namespace Edu.Module.Course ...@@ -366,8 +469,8 @@ namespace Edu.Module.Course
message = "人数报超" + (classModel.ClassPersion - (BNum + demodel.GuestNum)); message = "人数报超" + (classModel.ClassPersion - (BNum + demodel.GuestNum));
return flag; return flag;
} }
demodel.Class_Price = classModel.SellPrice; demodel.Class_Price = courseModel.SellPrice;
decimal MinPrice = classModel.SellPrice; decimal MinPrice = courseModel.SellPrice;
List<RB_Class_StepPrice_ViewModel> spList = new List<RB_Class_StepPrice_ViewModel>(); List<RB_Class_StepPrice_ViewModel> spList = new List<RB_Class_StepPrice_ViewModel>();
if (classModel.IsStepPrice == 1) if (classModel.IsStepPrice == 1)
{ {
...@@ -383,7 +486,7 @@ namespace Edu.Module.Course ...@@ -383,7 +486,7 @@ namespace Edu.Module.Course
message = "成交单价不能小于最低价格"; message = "成交单价不能小于最低价格";
return flag; return flag;
} }
if (demodel.PreferPrice != demodel.Unit_Price * demodel.GuestNum) if (demodel.PreferPrice != (demodel.Unit_Price * demodel.GuestNum-demodel.LessPrice))
{ {
flag = false; flag = false;
message = "应收总额不正确"; message = "应收总额不正确";
...@@ -762,7 +865,7 @@ namespace Edu.Module.Course ...@@ -762,7 +865,7 @@ namespace Edu.Module.Course
/// <param name="SourceId">留学就业产品编号</param> /// <param name="SourceId">留学就业产品编号</param>
/// <param name="ClassInfo"></param> /// <param name="ClassInfo"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Order_ViewModel> GetClassOrderList(int classId,int groupId,int SourceId,out object ClassInfo) public List<RB_Order_ViewModel> GetClassOrderList(int classId, int groupId, int SourceId, out object ClassInfo)
{ {
ClassInfo = new { }; ClassInfo = new { };
//获取订单列表 //获取订单列表
...@@ -786,19 +889,19 @@ namespace Edu.Module.Course ...@@ -786,19 +889,19 @@ namespace Edu.Module.Course
zModel?.AssistIcon zModel?.AssistIcon
}; };
} }
else if(SourceId>0) else if (SourceId > 0)
{ {
var studyModel = studyAbroadRepository.GetEntity(SourceId); var studyModel = studyAbroadRepository.GetEntity(SourceId);
if (studyModel != null && studyModel.Id > 0) if (studyModel != null && studyModel.Id > 0)
{ {
ClassInfo = new ClassInfo = new
{ {
StudyName=studyModel.Name, StudyName = studyModel.Name,
}; };
} }
} }
//获取订单列表 //获取订单列表
orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId,SourceId=SourceId }); orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId, SourceId = SourceId });
if (orderList.Any()) if (orderList.Any())
{ {
string orderIds = string.Join(",", orderList.Select(x => x.OrderId)); string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
...@@ -808,7 +911,8 @@ namespace Edu.Module.Course ...@@ -808,7 +911,8 @@ namespace Edu.Module.Course
var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderIds = orderIds }); var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
//获取合同列表 //获取合同列表
var clist = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = groupId, OrderIds = orderIds, Status = -1 }).Where(x => x.Status != 4).ToList(); var clist = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = groupId, OrderIds = orderIds, Status = -1 }).Where(x => x.Status != 4).ToList();
foreach (var item in orderList) { foreach (var item in orderList)
{
item.SaleRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 1).ToList(); item.SaleRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 1).ToList();
item.TeacherRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 2).ToList(); item.TeacherRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 2).ToList();
item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList(); item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList();
......
Edu.Repository/Course/RB_ClassRepository.cs
View file @ 39d4ac05
...@@ -235,7 +235,7 @@ WHERE A.ClassId={0} ...@@ -235,7 +235,7 @@ WHERE A.ClassId={0}
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
,IFNULL(t.GuestNum,0) AS OrderStudentCount ,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
LEFT JOIN rb_class_room AS R ON A.ClassRoomId=R.RoomId LEFT JOIN rb_class_room AS R ON A.ClassRoomId=R.RoomId
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 39d4ac05
...@@ -34,7 +34,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -34,7 +34,8 @@ namespace Edu.WebApi.Controllers.Course
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetClassPruductList() { public ApiResult GetClassPruductList()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var dmodel = JsonHelper.DeserializeObject<RB_Class_ViewModel>(RequestParm.Msg.ToString()); var dmodel = JsonHelper.DeserializeObject<RB_Class_ViewModel>(RequestParm.Msg.ToString());
...@@ -56,8 +57,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -56,8 +57,8 @@ namespace Edu.WebApi.Controllers.Course
OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"), OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"),
EndOrderTime = x.EndOrderTime.HasValue ? x.EndOrderTime.Value.ToString("yyyy年MM月dd日") : "", EndOrderTime = x.EndOrderTime.HasValue ? x.EndOrderTime.Value.ToString("yyyy年MM月dd日") : "",
IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0, IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0,
x.OriginalPrice, OriginalPrice=x.CourseOriginalPrice,
x.SellPrice, SellPrice=x.CourseSellPrice,
x.IsStepPrice, x.IsStepPrice,
x.ClassPersion, x.ClassPersion,
x.OutRemark, x.OutRemark,
...@@ -162,6 +163,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -162,6 +163,12 @@ namespace Edu.WebApi.Controllers.Course
x.RectorRemark, x.RectorRemark,
x.DirectorRemark, x.DirectorRemark,
x.OfferId, x.OfferId,
x.HelpEnterId,
HelpEnterName= UserReidsCache.GetUserLoginInfo(x.HelpEnterId)?.AccountName,
x.GeneralOccupation,
x.EduOccupation,
x.IsLessPrice,
x.LessPrice,
SaleRemarkList = x.SaleRemarkList.Select(z => new SaleRemarkList = x.SaleRemarkList.Select(z => new
{ {
z.Id, z.Id,
...@@ -231,6 +238,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -231,6 +238,12 @@ namespace Edu.WebApi.Controllers.Course
x.RectorRemark, x.RectorRemark,
x.DirectorRemark, x.DirectorRemark,
x.OfferId, x.OfferId,
x.HelpEnterId,
HelpEnterName = UserReidsCache.GetUserLoginInfo(x.HelpEnterId)?.AccountName,
x.GeneralOccupation,
x.EduOccupation,
x.IsLessPrice,
x.LessPrice,
SaleRemarkList = x.SaleRemarkList.Select(z => new SaleRemarkList = x.SaleRemarkList.Select(z => new
{ {
z.Id, z.Id,
...@@ -296,6 +309,11 @@ namespace Edu.WebApi.Controllers.Course ...@@ -296,6 +309,11 @@ namespace Edu.WebApi.Controllers.Course
SaleRemark=base.ParmJObj.GetStringValue("SaleRemark"), SaleRemark=base.ParmJObj.GetStringValue("SaleRemark"),
SourceId=base.ParmJObj.GetInt("SourceId"), SourceId=base.ParmJObj.GetInt("SourceId"),
Unit_Price=base.ParmJObj.GetDecimal("Unit_Price"), Unit_Price=base.ParmJObj.GetDecimal("Unit_Price"),
HelpEnterId=base.ParmJObj.GetInt("HelpEnterId"),
GeneralOccupation=base.ParmJObj.GetStringValue("GeneralOccupation"),
EduOccupation=base.ParmJObj.GetStringValue("EduOccupation"),
IsLessPrice=base.ParmJObj.GetInt("IsLessPrice"),
LessPrice=base.ParmJObj.GetDecimal("LessPrice"),
}; };
if (demodel.OrderType== OrderTypeEnum.CourseOrder &&demodel.ClassId <= 0) if (demodel.OrderType== OrderTypeEnum.CourseOrder &&demodel.ClassId <= 0)
{ {
...@@ -401,6 +419,11 @@ namespace Edu.WebApi.Controllers.Course ...@@ -401,6 +419,11 @@ namespace Edu.WebApi.Controllers.Course
model.SaleRemark, model.SaleRemark,
model.OrderType, model.OrderType,
model.SourceId, model.SourceId,
model.HelpEnterId,
model.GeneralOccupation,
model.EduOccupation,
model.IsLessPrice,
model.LessPrice,
}, },
StepPriceList = list.Select(x => new StepPriceList = list.Select(x => new
{ {
...@@ -1108,6 +1131,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1108,6 +1131,12 @@ namespace Edu.WebApi.Controllers.Course
RectorRemark = x?.RectorRemark ?? "", RectorRemark = x?.RectorRemark ?? "",
DirectorRemark = x?.DirectorRemark ?? "", DirectorRemark = x?.DirectorRemark ?? "",
x.OfferId, x.OfferId,
x.HelpEnterId,
HelpEnterName = UserReidsCache.GetUserLoginInfo(x.HelpEnterId)?.AccountName,
x.GeneralOccupation,
x.EduOccupation,
x.IsLessPrice,
x.LessPrice,
SaleRemarkList = x?.SaleRemarkList.Select(z => new SaleRemarkList = x?.SaleRemarkList.Select(z => new
{ {
z.Id, z.Id,
......
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