1

Edu.Model/Entity/Course/RB_Course.cs

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/OrderController.cs

@@ -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 ?? "",