Commit e9d31347 authored by 吴春's avatar 吴春

修改提交

parent 78742d01
...@@ -31,6 +31,15 @@ namespace Edu.Model.ViewModel.Grade ...@@ -31,6 +31,15 @@ namespace Edu.Model.ViewModel.Grade
/// 课程价格 /// 课程价格
/// </summary> /// </summary>
public decimal SellPrice { get; set; } public decimal SellPrice { get; set; }
/// <summary>
/// 教材费 2024-08-26 add by:w
/// </summary>
public decimal TextbookFee { get; set; }
/// <summary>
/// 课件费 2024-08-26 add by:w
/// </summary>
public decimal CoursewareFee { get; set; }
/// <summary> /// <summary>
/// 课程优惠价格信息 /// 课程优惠价格信息
......
...@@ -301,6 +301,17 @@ namespace Edu.Model.ViewModel.Grade ...@@ -301,6 +301,17 @@ namespace Edu.Model.ViewModel.Grade
/// 校代同行续费返佣比例 /// 校代同行续费返佣比例
/// </summary> /// </summary>
public decimal SchoolReNewRatio { get; set; } public decimal SchoolReNewRatio { get; set; }
/// <summary>
/// 教材费 2024-08-26 add by:w
/// </summary>
public decimal TextbookFee { get; set; }
/// <summary>
/// 课件费 2024-08-26 add by:w
/// </summary>
public decimal CoursewareFee { get; set; }
} }
/// <summary> /// <summary>
......
...@@ -327,6 +327,8 @@ namespace Edu.Module.Course ...@@ -327,6 +327,8 @@ namespace Edu.Module.Course
courseModel.CourseName, courseModel.CourseName,
courseModel.ClassHours, courseModel.ClassHours,
courseModel.SellPrice, courseModel.SellPrice,
courseModel.TextbookFee,
courseModel.CoursewareFee,
CoursePriceList CoursePriceList
}); });
} }
...@@ -346,6 +348,8 @@ namespace Edu.Module.Course ...@@ -346,6 +348,8 @@ namespace Edu.Module.Course
item.CourseName, item.CourseName,
item.ClassHours, item.ClassHours,
item.SellPrice, item.SellPrice,
item.TextbookFee,
item.CoursewareFee,
item.CoursePriceList item.CoursePriceList
}); });
} }
......
...@@ -370,7 +370,7 @@ WHERE A.ClassId={0} ...@@ -370,7 +370,7 @@ WHERE A.ClassId={0}
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName 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,B.SellPriceType as CourseSellPriceType,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice ,B.B2CRatio,B.B2CReNewRatio,B.B2BRebateRatio,B.B2BReNewRatio,B.SchoolRebateRatio,B.SchoolReNewRatio ,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
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
......
...@@ -24,7 +24,7 @@ namespace Edu.Repository.Grade ...@@ -24,7 +24,7 @@ namespace Edu.Repository.Grade
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* ,IFNULL(B.CourseName,'') AS CourseName,IFNULL(B.ClassHours,0) AS ClassHours,IFNULL(B.SellPrice,0) AS SellPrice SELECT A.* ,IFNULL(B.CourseName,'') AS CourseName,IFNULL(B.ClassHours,0) AS ClassHours,IFNULL(B.SellPrice,0) AS SellPrice,IFNULL(B.CoursewareFee,0) AS CoursewareFee,IFNULL(B.TextbookFee,0) AS TextbookFee
FROM RB_Class_Course AS A LEFT JOIN rb_course AS B ON A.CourseId=B.CourseId FROM RB_Class_Course AS A LEFT JOIN rb_course AS B ON A.CourseId=B.CourseId
WHERE 1=1 WHERE 1=1
"); ");
......
...@@ -688,7 +688,10 @@ GROUP BY GuestId"; ...@@ -688,7 +688,10 @@ GROUP BY GuestId";
{ {
logContent += string.Format("客人来源:由【{0}】=>【{1}】,", oldModel.CreateType.ToName(), model.CreateType.ToName()); logContent += string.Format("客人来源:由【{0}】=>【{1}】,", oldModel.CreateType.ToName(), model.CreateType.ToName());
} }
if (oldModel.StudentType != model.StudentType)
{
logContent += string.Format("客人类型:由【{0}】=>【{1}】,", oldModel.StudentType==2? "留学客户" : "普通客户", model.StudentType == 2 ? "留学客户" : "普通客户");
}
if (oldModel.StuSourceId != model.StuSourceId) if (oldModel.StuSourceId != model.StuSourceId)
{ {
string oldName = ""; string oldName = "";
...@@ -758,6 +761,8 @@ GROUP BY GuestId"; ...@@ -758,6 +761,8 @@ GROUP BY GuestId";
{nameof(RB_Student_ViewModel.StuType),model.StuType}, {nameof(RB_Student_ViewModel.StuType),model.StuType},
{nameof(RB_Student_ViewModel.StuRealMobile),model.StuRealMobile}, {nameof(RB_Student_ViewModel.StuRealMobile),model.StuRealMobile},
{nameof(RB_Student_ViewModel.TelType),model.TelType}, {nameof(RB_Student_ViewModel.TelType),model.TelType},
{nameof(RB_Student_ViewModel.StudentType),model.StudentType},
}; };
if (!string.IsNullOrEmpty(model.FileVoucher)) if (!string.IsNullOrEmpty(model.FileVoucher))
{ {
......
...@@ -369,6 +369,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -369,6 +369,8 @@ namespace Edu.WebApi.Controllers.Course
qitem.TeacherIdList, qitem.TeacherIdList,
qitem.OriginalPrice, qitem.OriginalPrice,
qitem.SellPrice, qitem.SellPrice,
qitem.TextbookFee,
qitem.CoursewareFee,
qitem.SalePlatList, qitem.SalePlatList,
qitem.SalePlatArr, qitem.SalePlatArr,
qitem.ClassHours, qitem.ClassHours,
......
...@@ -103,6 +103,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -103,6 +103,8 @@ namespace Edu.WebApi.Controllers.Course
TeacherHead = x?.TeacherHead ?? "", TeacherHead = x?.TeacherHead ?? "",
RoomName = x?.RoomName ?? "", RoomName = x?.RoomName ?? "",
ClassStyle = x?.ClassStyle ?? 0, ClassStyle = x?.ClassStyle ?? 0,
x.TextbookFee,
x.CoursewareFee,
ClassStyleName, ClassStyleName,
OpenTime = Common.ConvertHelper.FormatDate2(x.OpenTime), OpenTime = Common.ConvertHelper.FormatDate2(x.OpenTime),
EndOrderTime = Common.ConvertHelper.FormatDate2(x.EndOrderTime), EndOrderTime = Common.ConvertHelper.FormatDate2(x.EndOrderTime),
......
...@@ -1545,6 +1545,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1545,6 +1545,7 @@ namespace Edu.WebApi.Controllers.User
extModel.FileVoucher, extModel.FileVoucher,
extModel.TelType, extModel.TelType,
TelTypeName = extModel.TelType.ToName(), TelTypeName = extModel.TelType.ToName(),
extModel.StudentType,
}; };
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
......
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