Skip to content

E
Education
Commit f467763b authored by 吴春's avatar 吴春
Browse files
Options

1

parent 6e86170d
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 38 deletions
Edu.Model/Entity/Course/RB_Course.cs
View file @ f467763b
......@@ -97,6 +97,22 @@ namespace Edu.Model.Entity.Course
/// </summary>
public decimal SellPrice { 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>
public decimal TextbookFee { get; set; }
/// <summary>
/// 课件费 2024-08-26 add by:w
/// </summary>
public decimal CoursewareFee { get; set; }
/// <summary>
/// 是否开启阶梯定价(1-开启)
/// </summary>
......
Edu.Model/Entity/Sell/RB_Order.cs
View file @ f467763b
......@@ -37,6 +37,26 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public decimal Unit_Price { 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>
public decimal TextbookFee { get; set; }
/// <summary>
/// 课件费 2024-08-26 add by:w
/// </summary>
public decimal CoursewareFee { get; set; }
/// <summary>
/// 总课时 2024-08-26 add by:W
/// </summary>
public int TotalClassHours { get; set; }
/// <summary>
/// 客人数量
/// </summary>
......
Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs
View file @ f467763b
......@@ -198,6 +198,12 @@ namespace Edu.Model.ViewModel.Grade
/// </summary>
public decimal CourseSellPrice { get; set; }
/// <summary>
/// 课程售价类型
/// </summary>
public int CourseSellPriceType { get; set; }
/// <summary>
/// 课程原价
/// </summary>
......
Edu.Module.Course/CourseModule.cs
View file @ f467763b
......@@ -1608,6 +1608,9 @@ namespace Edu.Module.Course
{
{nameof(RB_Course_ViewModel.OriginalPrice),courseModel.OriginalPrice },
{nameof(RB_Course_ViewModel.SellPrice),courseModel.SellPrice },
{nameof(RB_Course_ViewModel.SellPriceType),courseModel.SellPriceType },
{nameof(RB_Course_ViewModel.CoursewareFee),courseModel.CoursewareFee },
{nameof(RB_Course_ViewModel.TextbookFee),courseModel.TextbookFee },
{nameof(RB_Course_ViewModel.B2CRatio),courseModel.B2CRatio },
{nameof(RB_Course_ViewModel.B2CReNewRatio),courseModel.B2CReNewRatio },
......
Edu.Repository/Grade/RB_ClassRepository.cs
View file @ f467763b
......@@ -370,7 +370,7 @@ WHERE A.ClassId={0}
StringBuilder builder = new StringBuilder();
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.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,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
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
......
Edu.WebApi/Controllers/Course/CourseController.cs
View file @ f467763b
......@@ -55,7 +55,7 @@ namespace Edu.WebApi.Controllers.Course
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Course_Subject_ViewModel()
{
SubjectName=base.ParmJObj.GetStringValue("SubjectName"),
SubjectName = base.ParmJObj.GetStringValue("SubjectName"),
};
query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id;
......@@ -91,7 +91,7 @@ namespace Edu.WebApi.Controllers.Course
var list = categoryModule.GetCourseSubjectListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 添加修改课程科目
......@@ -145,7 +145,8 @@ namespace Edu.WebApi.Controllers.Course
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCourseEmphasisEnumList() {
public ApiResult GetCourseEmphasisEnumList()
{
var list = EnumHelper.EnumToList(typeof(CourseEmphasisEnum));
return ApiResult.Success("", list.OrderBy(x => x.Id).Select(x => new
{
......@@ -246,7 +247,7 @@ namespace Edu.WebApi.Controllers.Course
ParentId = base.ParmJObj.GetInt("ParentId"),
SortNum = base.ParmJObj.GetInt("SortNum"),
Status = (DateStateEnum)base.ParmJObj.GetInt("Status"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
};
extModel.CreateTime = DateTime.Now;
extModel.CreateBy = UserInfo.Id;
......@@ -353,7 +354,7 @@ namespace Edu.WebApi.Controllers.Course
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
IsQuerySalePlat = base.ParmJObj.GetInt("IsQuerySalePlat"),
IsScrollClass = base.ParmJObj.GetInt("IsScrollClass", 0),
SaleState=base.ParmJObj.GetInt("SaleState"),
SaleState = base.ParmJObj.GetInt("SaleState"),
};
query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id;
......@@ -428,7 +429,7 @@ namespace Edu.WebApi.Controllers.Course
AddHoursMoney = base.ParmJObj.GetDecimal("AddHoursMoney"),
ChineseHours = base.ParmJObj.GetDecimal("ChineseHours"),
ForeignHours = base.ParmJObj.GetDecimal("ForeignHours"),
SaleState=base.ParmJObj.GetInt("SaleState"),
SaleState = base.ParmJObj.GetInt("SaleState"),
};
try
{
......@@ -700,8 +701,8 @@ namespace Edu.WebApi.Controllers.Course
{
var query = new RB_Course_Chapter_ViewModel()
{
CourseId=base.ParmJObj.GetInt("CourseId"),
IsQRoot =base.ParmJObj.GetInt("IsQRoot"),
CourseId = base.ParmJObj.GetInt("CourseId"),
IsQRoot = base.ParmJObj.GetInt("IsQRoot"),
};
if (query.CourseId <= 0)
{
......@@ -716,7 +717,7 @@ namespace Edu.WebApi.Controllers.Course
qitem.ChapterGradeNo,
qitem.ChapterName,
qitem.CourseRate,
CourseRateName= qitem.CourseRate.ToName(),
CourseRateName = qitem.CourseRate.ToName(),
}));
}
......@@ -766,7 +767,7 @@ namespace Edu.WebApi.Controllers.Course
[HttpPost]
public ApiResult GetCourseRateEnumList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(CourseRateEnum)).OrderBy(qitem=>qitem.Id);
var list = Common.Plugin.EnumHelper.EnumToList(typeof(CourseRateEnum)).OrderBy(qitem => qitem.Id);
return ApiResult.Success(data: list);
}
......@@ -858,7 +859,7 @@ namespace Edu.WebApi.Controllers.Course
{
bool flag = false;
List<RB_Course_Chapter_ViewModel> list = new List<RB_Course_Chapter_ViewModel>();
if (!string.IsNullOrEmpty(RequestParm.Msg.ToString()))
{
try
......@@ -886,8 +887,8 @@ namespace Edu.WebApi.Controllers.Course
}
}
catch
{
{
}
}
if (list != null && list.Count > 0)
......@@ -1337,7 +1338,7 @@ namespace Edu.WebApi.Controllers.Course
}
/// <summary>
/// 批量设置课程优惠价格
/// 批量设置课程优惠价格 2024-08-26 update by:W 新增报价类型，按课时报价。
/// </summary>
/// <returns></returns>
public ApiResult SetBeatchCoursePreferential()
......@@ -1348,50 +1349,53 @@ namespace Edu.WebApi.Controllers.Course
CourseId = courseObj.GetInt("CourseId"),
OriginalPrice = courseObj.GetDecimal("OriginalPrice"),
SellPrice = courseObj.GetDecimal("SellPrice"),
SellPriceType = courseObj.GetInt("SellPriceType", 1),
TextbookFee = courseObj.GetDecimal("TextbookFee"),
CoursewareFee = courseObj.GetDecimal("CoursewareFee"),
B2CRatio = courseObj.GetDecimal("B2CRatio"),
B2CReNewRatio = courseObj.GetDecimal("B2CReNewRatio"),
B2BRebateRatio = courseObj.GetDecimal("B2BRebateRatio"),
B2BRebateRatioType= (CourseRebateSetEnum)courseObj.GetInt("B2BRebateRatioType"),
B2BRebateRatioValue= courseObj.GetDecimal("B2BRebateRatioValue"),
B2BRebateRatioType = (CourseRebateSetEnum)courseObj.GetInt("B2BRebateRatioType"),
B2BRebateRatioValue = courseObj.GetDecimal("B2BRebateRatioValue"),
B2BReNewRatio = courseObj.GetDecimal("B2BReNewRatio"),
B2BReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("B2BReNewRatioType"),
B2BReNewRatioValue= courseObj.GetDecimal("B2BReNewRatioValue"),
B2BReNewRatioValue = courseObj.GetDecimal("B2BReNewRatioValue"),
SchoolRebateRatio = courseObj.GetDecimal("SchoolRebateRatio"),
SchoolRebateRatioType= (CourseRebateSetEnum)courseObj.GetInt("SchoolRebateRatioType"),
SchoolRebateRatioValue= courseObj.GetDecimal("SchoolRebateRatioValue"),
SchoolRebateRatioType = (CourseRebateSetEnum)courseObj.GetInt("SchoolRebateRatioType"),
SchoolRebateRatioValue = courseObj.GetDecimal("SchoolRebateRatioValue"),
SchoolReNewRatio = courseObj.GetDecimal("SchoolReNewRatio"),
SchoolReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("SchoolReNewRatioType"),
SchoolReNewRatioValue = courseObj.GetDecimal("SchoolReNewRatioValue"),
InnerRecommendRatio =courseObj.GetDecimal("InnerRecommendRatio"),
InnerRecommendRatio = courseObj.GetDecimal("InnerRecommendRatio"),
InnerRecommendRatioType = (CourseRebateSetEnum)courseObj.GetInt("InnerRecommendRatioType"),
InnerRecommendRatioValue= courseObj.GetDecimal("InnerRecommendRatioValue"),
InnerRecommendRatioValue = courseObj.GetDecimal("InnerRecommendRatioValue"),
InnerRecommendReNewRatio =courseObj.GetDecimal("InnerRecommendReNewRatio"),
InnerRecommendReNewRatio = courseObj.GetDecimal("InnerRecommendReNewRatio"),
InnerRecommendReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("InnerRecommendReNewRatioType"),
InnerRecommendReNewRatioValue= courseObj.GetDecimal("InnerRecommendReNewRatioValue"),
InnerRecommendReNewRatioValue = courseObj.GetDecimal("InnerRecommendReNewRatioValue"),
TransIntroductceRatio =courseObj.GetDecimal("TransIntroductceRatio"),
TransIntroductceRatio = courseObj.GetDecimal("TransIntroductceRatio"),
TransIntroductceRatioType = (CourseRebateSetEnum)courseObj.GetInt("TransIntroductceRatioType"),
TransIntroductceRatioValue = courseObj.GetDecimal("TransIntroductceRatioValue"),
TransIntroductceReNewRatio =courseObj.GetDecimal("TransIntroductceReNewRatio"),
TransIntroductceReNewRatio = courseObj.GetDecimal("TransIntroductceReNewRatio"),
TransIntroductceReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("TransIntroductceReNewRatioType"),
TransIntroductceReNewRatioValue = courseObj.GetDecimal("TransIntroductceReNewRatioValue"),
CommissionReType = courseObj.GetInt("CommissionReType"),
B2CRbRatio=courseObj.GetDecimal("B2CRbRatio"),
B2CRbRatioType=(CourseRebateSetEnum)courseObj.GetInt("B2CRbRatioType"),
B2CRbRatioValue=courseObj.GetDecimal("B2CRbRatioValue"),
CommissionReType = courseObj.GetInt("CommissionReType"),
B2CRbRatio = courseObj.GetDecimal("B2CRbRatio"),
B2CRbRatioType = (CourseRebateSetEnum)courseObj.GetInt("B2CRbRatioType"),
B2CRbRatioValue = courseObj.GetDecimal("B2CRbRatioValue"),
B2CRNRatio=courseObj.GetDecimal("B2CRNRatio"),
B2CRNRatioType= (CourseRebateSetEnum)courseObj.GetInt("B2CRNRatioType"),
B2CRNRatioValue=courseObj.GetDecimal("B2CRNRatioValue"),
B2CRNRatio = courseObj.GetDecimal("B2CRNRatio"),
B2CRNRatioType = (CourseRebateSetEnum)courseObj.GetInt("B2CRNRatioType"),
B2CRNRatioValue = courseObj.GetDecimal("B2CRNRatioValue"),
};
var priceObj = base.ParmJObj.GetStringValue("priceList");
var list = new List<RB_Course_Preferential_Extend>();
......@@ -1448,13 +1452,16 @@ namespace Edu.WebApi.Controllers.Course
var extModel = courseModule.GetCourseModule(courseModel.CourseId, IsGetDiscount: 0);
extModel.OriginalPrice = courseModel.OriginalPrice;
extModel.SellPrice = courseModel.SellPrice;
extModel.SellPriceType = courseModel.SellPriceType;
extModel.TextbookFee = courseModel.TextbookFee;
extModel.CoursewareFee = courseModel.CoursewareFee;
extModel.B2CRatio = courseModel.B2CRatio;
extModel.B2CReNewRatio = courseModel.B2CReNewRatio;
extModel.B2BRebateRatio = courseModel.B2BRebateRatio;
extModel.B2BRebateRatioType = courseModel.B2BRebateRatioType;
extModel.B2BRebateRatioValue = courseModel.B2BRebateRatioValue;
extModel.B2BReNewRatio = courseModel.B2BReNewRatio;
extModel.B2BReNewRatioType = courseModel.B2BReNewRatioType;
extModel.B2BReNewRatioValue = courseModel.B2BReNewRatioValue;
......@@ -1469,7 +1476,7 @@ namespace Edu.WebApi.Controllers.Course
extModel.InnerRecommendRatio = courseModel.InnerRecommendRatio;
extModel.InnerRecommendRatioType = courseModel.InnerRecommendRatioType;
extModel.InnerRecommendRatioValue= courseModel.InnerRecommendRatioValue;
extModel.InnerRecommendRatioValue = courseModel.InnerRecommendRatioValue;
extModel.InnerRecommendReNewRatio = courseModel.InnerRecommendReNewRatio;
extModel.InnerRecommendReNewRatioType = courseModel.InnerRecommendReNewRatioType;
......@@ -1600,8 +1607,8 @@ namespace Edu.WebApi.Controllers.Course
Id = base.ParmJObj.GetInt("Id"),
LessonName = base.ParmJObj.GetStringValue("LessonName"),
TeacherId = base.ParmJObj.GetInt("TeacherId"),
ClassHourFee=base.ParmJObj.GetDecimal("ClassHourFee"),
CalculateType=base.ParmJObj.GetInt("CalculateType"),
ClassHourFee = base.ParmJObj.GetDecimal("ClassHourFee"),
CalculateType = base.ParmJObj.GetInt("CalculateType"),
};
extModel.CreateTime = DateTime.Now;
extModel.CreateBy = UserInfo.Id;
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ f467763b
......@@ -109,6 +109,7 @@ namespace Edu.WebApi.Controllers.Course
IsCanApply,
OriginalPrice = x?.CourseOriginalPrice ?? 0,
SellPrice = x?.CourseSellPrice ?? 0,
SellPriceType = x?.CourseSellPriceType ?? 0,
IsStepPrice = x?.IsStepPrice ?? 0,
ClassPersion = x?.ClassPersion ?? 0,
OutRemark = x?.OutRemark ?? "",
......
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