修改提交

Edu.Model/ViewModel/Grade/RB_Class_Course_Extend.cs

@@ -31,6 +31,15 @@ namespace Edu.Model.ViewModel.Grade
         /// 课程价格
         /// </summary>
         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>
         /// 课程优惠价格信息

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

@@ -301,6 +301,17 @@ namespace Edu.Model.ViewModel.Grade
         /// 校代同行续费返佣比例
         /// </summary>
         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>

Edu.Module.Course/OrderModule.cs

@@ -327,6 +327,8 @@ namespace Edu.Module.Course
                     courseModel.CourseName,
                     courseModel.ClassHours,
                     courseModel.SellPrice,
+                    courseModel.TextbookFee,
+                    courseModel.CoursewareFee,
                     CoursePriceList
                 });
             }
@@ -346,6 +348,8 @@ namespace Edu.Module.Course
                         item.CourseName,
                         item.ClassHours,
                         item.SellPrice,
+                        item.TextbookFee,
+                        item.CoursewareFee,
                         item.CoursePriceList
                     });
                 }

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,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
 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.Repository/Grade/RB_Class_CourseRepository.cs

@@ -24,7 +24,7 @@ namespace Edu.Repository.Grade
         {
             StringBuilder builder = new StringBuilder();
             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
 WHERE 1=1
 ");

Edu.Repository/User/RB_StudentRepository.cs

@@ -688,7 +688,10 @@ GROUP BY GuestId";
                 {
                     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)
                 {
                     string oldName = "";
@@ -758,6 +761,8 @@ GROUP BY GuestId";
                     {nameof(RB_Student_ViewModel.StuType),model.StuType},
                     {nameof(RB_Student_ViewModel.StuRealMobile),model.StuRealMobile},
                     {nameof(RB_Student_ViewModel.TelType),model.TelType},
+                    {nameof(RB_Student_ViewModel.StudentType),model.StudentType},
+                    
                 };
                 if (!string.IsNullOrEmpty(model.FileVoucher))
                 {

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -369,6 +369,8 @@ namespace Edu.WebApi.Controllers.Course
                 qitem.TeacherIdList,
                 qitem.OriginalPrice,
                 qitem.SellPrice,
+                qitem.TextbookFee,
+                qitem.CoursewareFee,
                 qitem.SalePlatList,
                 qitem.SalePlatArr,
                 qitem.ClassHours,

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -103,6 +103,8 @@ namespace Edu.WebApi.Controllers.Course
                     TeacherHead = x?.TeacherHead ?? "",
                     RoomName = x?.RoomName ?? "",
                     ClassStyle = x?.ClassStyle ?? 0,
+                    x.TextbookFee,
+                    x.CoursewareFee,
                     ClassStyleName,
                     OpenTime = Common.ConvertHelper.FormatDate2(x.OpenTime),
                     EndOrderTime = Common.ConvertHelper.FormatDate2(x.EndOrderTime),

Edu.WebApi/Controllers/User/UserController.cs

@@ -1545,6 +1545,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.FileVoucher,
                 extModel.TelType,
                 TelTypeName = extModel.TelType.ToName(),
+                extModel.StudentType,
             };
             return ApiResult.Success(data: obj);
         }