Skip to content

E
Education
Commit 00707f27 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 105e25cb cb21769f
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 14 deletions
Edu.Model/Entity/Sell/RB_Order.cs
View file @ 00707f27
......@@ -48,6 +48,12 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public decimal CoursewareFee { get; set; }
/// <summary>
/// 价格类型，1-基础价格，2-课时价格 2024-08-26 add by:w
/// </summary>
public int SellPriceType { get; set; }
/// <summary>
/// 总课时 2024-08-26 add by:W
/// </summary>
......
Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs
View file @ 00707f27
......@@ -312,6 +312,11 @@ namespace Edu.Model.ViewModel.Grade
/// </summary>
public decimal CoursewareFee { get; set; }
/// <summary>
/// 总课时
/// </summary>
public decimal TotalClassHours { get;set; }
}
/// <summary>
......
Edu.Module.Course/OrderModule.cs
View file @ 00707f27
......@@ -1171,6 +1171,9 @@ namespace Edu.Module.Course
{ nameof(RB_Order_ViewModel.UpOrderId),demodel.UpOrderId},
{ nameof(RB_Order_ViewModel.CustomerId),demodel.CustomerId},
{ nameof(RB_Order_ViewModel.CourseConsultantId),demodel.CourseConsultantId},
{ nameof(RB_Order_ViewModel.TotalClassHours),demodel.TotalClassHours},
{ nameof(RB_Order_ViewModel.TextbookFee),demodel.TextbookFee},
{ nameof(RB_Order_ViewModel.CoursewareFee),demodel.CoursewareFee},
};
flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
......@@ -1188,6 +1191,18 @@ namespace Edu.Module.Course
{
LogContent += $"，优惠金额由【{(orderModel.DiscountMoney)}】修改为【{(demodel.DiscountMoney)}】";
}
if (orderModel.TotalClassHours != demodel.TotalClassHours)
{
LogContent += $"，总课时由【{(orderModel.TotalClassHours)}】修改为【{(demodel.TotalClassHours)}】";
}
if (orderModel.TextbookFee != demodel.TextbookFee)
{
LogContent += $"，教材费由【{(orderModel.TextbookFee)}】修改为【{(demodel.TextbookFee)}】";
}
if (orderModel.CoursewareFee != demodel.CoursewareFee)
{
LogContent += $"，课件费由【{(orderModel.CoursewareFee)}】修改为【{(demodel.CoursewareFee)}】";
}
if (orderModel.PerDiscountMoney != demodel.PerDiscountMoney)
{
LogContent += $"，每人优惠金额由【{(orderModel.PerDiscountMoney)}】修改为【{(demodel.PerDiscountMoney)}】";
......
Edu.Module.Duty/VisitorReserveModule.cs
View file @ 00707f27
......@@ -334,7 +334,7 @@ namespace Edu.Module.Duty
SendType = 0,
Title = "学员试听课通知",
Platform = 5,
ReceiveId = x.WorkUserId
ReceiveId = x.WorkUserId??""
};
List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
......@@ -410,7 +410,7 @@ namespace Edu.Module.Duty
SendType = 0,
Title = "学员留学需求通知",
Platform = 5,
ReceiveId = x.WorkUserId
ReceiveId = x.WorkUserId??""
};
pushList.Add(modelWork);
});
......@@ -1117,7 +1117,7 @@ namespace Edu.Module.Duty
SendType = 0,
Title = "试听课",
Platform = 2,
ReceiveId = (teacherList.Where(qitem => qitem.AccountId == model.TeacherId)?.FirstOrDefault()?.WorkUserId).ToString(),
ReceiveId = (teacherList.Where(qitem => qitem.AccountId == model.TeacherId)?.FirstOrDefault()?.WorkUserId ?? "").ToString(),
};
pushList.Add(pushModel);
#endregion
......@@ -1149,7 +1149,7 @@ namespace Edu.Module.Duty
SendType = 0,
Title = "试听课",
Platform = 2,
ReceiveId = (saleModel?.WorkUserId).ToString(),
ReceiveId = (saleModel?.WorkUserId ?? "").ToString(),
};
pushList.Add(pushModels);
#endregion
......
Edu.Repository/Grade/RB_ClassRepository.cs
View file @ 00707f27
......@@ -371,7 +371,7 @@ WHERE A.ClassId={0}
builder.AppendFormat(@"
SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.CoursewareFee,0) AS CoursewareFee,IFNULL(B.TextbookFee,0) AS TextbookFee,B.SellPriceType as CourseSellPriceType,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice ,B.B2CRatio,B.B2CReNewRatio,B.B2BRebateRatio,B.B2BReNewRatio,B.SchoolRebateRatio,B.SchoolReNewRatio
,B.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName
,B.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName,IFNULL(b.ClassHours,0) as TotalClassHours
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_class_room AS R ON A.ClassRoomId=R.RoomId
......
Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs
View file @ 00707f27
......@@ -31,7 +31,7 @@ namespace Edu.Repository.Reserve
builder.Append(@"
SELECT A.*,IFNULL(B.StuName,'') AS VisitorName,C.ClassDate,C.ClassTime,C.EndTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
,IFNULL(B.StuTel,'') AS StuTel,IFNULL(F.LessonName,'') AS LessonName,IFNULL(B.QQ,'') AS QQ,IFNULL(B.WeChatNo,'') AS WeChatNo,C.ReserveType,C.ClassPlanId
,IFNULL(G.OrderCount,0) AS OrderCount
,IFNULL(G.OrderCount,0) AS OrderCount,c.ClassRoomId,C.TeacherId,c.TrialLessonId
FROM RB_Visitor_Reserve AS A LEFT JOIN rb_student AS B ON A.Visitor_Id=B.StuId
LEFT JOIN
(
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 00707f27
......@@ -140,7 +140,8 @@ namespace Edu.WebApi.Controllers.Course
B2BRebateRatio = x?.B2BRebateRatio ?? 0,
B2BReNewRatio = x?.B2BReNewRatio ?? 0,
SchoolRebateRatio = x?.SchoolRebateRatio ?? 0,
SchoolReNewRatio = x?.SchoolReNewRatio ?? 0
SchoolReNewRatio = x?.SchoolReNewRatio ?? 0,
x.TotalClassHours,
};
result.Add(obj);
}
......@@ -553,9 +554,7 @@ namespace Edu.WebApi.Controllers.Course
SaleRemark = base.ParmJObj.GetStringValue("SaleRemark"),
SourceId = base.ParmJObj.GetInt("SourceId"),
Unit_Price = base.ParmJObj.GetDecimal("Unit_Price"),
TotalClassHours = base.ParmJObj.GetDecimal("TotalClassHours"),
TextbookFee = base.ParmJObj.GetDecimal("TextbookFee"),
CoursewareFee = base.ParmJObj.GetDecimal("CoursewareFee"),
HelpEnterId = base.ParmJObj.GetInt("HelpEnterId"),
GeneralOccupation = base.ParmJObj.GetStringValue("GeneralOccupation"),
EduOccupation = base.ParmJObj.GetStringValue("EduOccupation"),
......@@ -579,7 +578,11 @@ namespace Edu.WebApi.Controllers.Course
OrderIdentify = base.ParmJObj.GetInt("OrderIdentify"),
CourseConsultantId = base.ParmJObj.GetInt("CourseConsultantId"),
EnterID = base.ParmJObj.GetInt("EnterId"),
ScrollSchoolId = base.ParmJObj.GetInt("ScrollSchoolId")
ScrollSchoolId = base.ParmJObj.GetInt("ScrollSchoolId"),
SellPriceType = base.ParmJObj.GetInt("Unit_PriceType", 1),
TotalClassHours = base.ParmJObj.GetDecimal("TotalClassHours"),
TextbookFee = base.ParmJObj.GetDecimal("TextbookFee"),
CoursewareFee = base.ParmJObj.GetDecimal("CoursewareFee"),
};
var IsInsertClass = base.ParmJObj.GetInt("IsChaBan");
if (IsInsertClass == 1)
......@@ -704,7 +707,7 @@ namespace Edu.WebApi.Controllers.Course
HelpEnterId = parms.GetInt("HelpEnterId"),
GeneralOccupation = parms.GetStringValue("GeneralOccupation"),
EduOccupation = parms.GetStringValue("EduOccupation"),
OrderNature = (OrderNatureEnum)parms.GetInt("OrderNature"),
OldPreferPrice = parms.GetDecimal("OldPreferPrice"),
CourseId = parms.GetInt("CourseId"),
......@@ -724,7 +727,11 @@ namespace Edu.WebApi.Controllers.Course
OrderIdentify = parms.GetInt("OrderIdentify"),
CourseConsultantId = parms.GetInt("CourseConsultantId"),
EnterID = parms.GetInt("EnterId"),
ScrollSchoolId = parms.GetInt("ScrollSchoolId")
ScrollSchoolId = parms.GetInt("ScrollSchoolId"),
SellPriceType = parms.GetInt("Unit_PriceType", 1),
TotalClassHours = parms.GetInt("TotalClassHours"),
TextbookFee = parms.GetDecimal("TextbookFee"),
CoursewareFee = parms.GetDecimal("CoursewareFee"),
};
var IsInsertClass = parms.GetInt("IsChaBan");
......@@ -911,7 +918,11 @@ namespace Edu.WebApi.Controllers.Course
model.B2BRebateRatio,
model.B2BReNewRatio,
model.SchoolRebateRatio,
model.SchoolReNewRatio
model.SchoolReNewRatio,
Unit_PriceType= model.SellPriceType,//价格类型：1-总课时费，2-课时单价 2024-08-26 add by:W
model.TotalClassHours,//总课时数 2024-08-26 add by:W
model.CoursewareFee,//教材费
model.TextbookFee,//课件费
},
StepPriceList = list.Select(x => new
{
......@@ -1905,6 +1916,10 @@ namespace Edu.WebApi.Controllers.Course
x.StuSourceIdName,
x.BrokerageMoney,
x.StudyBroadRebateMoney,
x.TextbookFee,
x.CoursewareFee,
x.SellPriceType,
x.TotalClassHours,
})
};
pageModel.PageData = obj;
......@@ -1935,6 +1950,8 @@ namespace Edu.WebApi.Controllers.Course
new ExcelColumn(value:"人数"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"成交单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"教材费"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"课件费"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"应收总额"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"实收"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"优惠金额"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -2002,6 +2019,8 @@ namespace Edu.WebApi.Controllers.Course
new ExcelColumn(value: item.GuestNum.ToString()){ },
new ExcelColumn(value: item.Class_Price.ToString("#0.00")){ },
new ExcelColumn(value: item.Unit_Price.ToString("#0.00")){ },
new ExcelColumn(value: item.TextbookFee.ToString("#0.00")){ },
new ExcelColumn(value: item.CoursewareFee.ToString("#0.00")){ },
new ExcelColumn(value: item.PreferPrice.ToString("#0.00")){ },
new ExcelColumn(value: item.Income.ToString("#0.00")){ },
new ExcelColumn(value: item.DiscountMoney.ToString("#0.00")){ },
......@@ -2039,6 +2058,8 @@ namespace Edu.WebApi.Controllers.Course
new ExcelColumn(value: list.Sum(x=>x.GuestNum).ToString()){ },
new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ },
new ExcelColumn(value: list.Sum(x=>x.TextbookFee).ToString("#0.00")){ },
new ExcelColumn(value: list.Sum(x=>x.CoursewareFee).ToString("#0.00")){ },
new ExcelColumn(value: list.Sum(x=>x.PreferPrice).ToString("#0.00")){ },
new ExcelColumn(value: list.Sum(x=>x.Income).ToString("#0.00")){ },
new ExcelColumn(value: list.Sum(x=>x.DiscountMoney).ToString("#0.00")){ },
......
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