页面修改

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

@@ -106,11 +106,6 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public List<ClassTimeItem> DefaultTimeList { get; set; }
 
-        /// <summary>
-        /// 课程优惠信息列表
-        /// </summary>
-        public List<RB_Course_Preferential_Extend> PreferentialList { get; set; }
-
         /// <summary>
         /// 开课时间
         /// </summary>

Edu.Module.Course/OrderModule.cs

@@ -230,12 +230,7 @@ namespace Edu.Module.Course
                 string classIds = string.Join(",", list.Select(x => x.ClassId));
                 string courseIds = string.Join(",", list.Select(qitem => qitem.CouseId));
                 //查询阶梯价格
-                List<RB_Course_Preferential_Extend> coursePreferentialList = new List<RB_Course_Preferential_Extend>();
                 var stepList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = classIds });
-                coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
-                {
-                    QCourseIds = courseIds
-                });
                 var otherCourseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { QClassIds = classIds });
                 List<RB_Class_Plan_ViewModel> PlanFixed = new List<RB_Class_Plan_ViewModel>();
                 string k2classIds = string.Join(",", list.Where(x => x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate).Select(x => x.ClassId));
@@ -245,7 +240,6 @@ namespace Edu.Module.Course
                 }
                 foreach (var item in list)
                 {
-                    item.PreferentialList = coursePreferentialList?.Where(qitem => qitem.CourseId == item.CouseId)?.ToList() ?? new List<RB_Course_Preferential_Extend>();
                     item.ClassStepPriceList = stepList.Where(x => x.ClassId == item.ClassId).OrderBy(x => x.PersionNum).ToList();
                     item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>();
                     item.DefaultTimeList = new List<ClassTimeItem>();

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -95,23 +95,6 @@ namespace Edu.WebApi.Controllers.Course
                     x.OutRemark,
                     x.OrderStudentCount,
                     SurplusNum,
-                    PreferentialList= x?.PreferentialList.Select(qitem=>new { 
-                       qitem.B2BCommissionMoney,
-                       qitem.B2BCommissionType,
-                       qitem.BuyNum,
-                       qitem.CourseId,
-                       qitem.EduCommissionMoney,
-                       qitem.EduCommissionType,
-                       qitem.Id,
-                       qitem.PreferentialTerms,
-                       qitem.PriceDiscountType,
-                       qitem.PriceDiscountTypeStr,
-                       qitem.PriceMoney,
-                       qitem.PriceType,
-                       qitem.SaleCommissionMoney,
-                       qitem.SaleCommissionType,
-                       qitem.SendNum,
-                    }),
                     ClassStepPriceList = x.ClassStepPriceList.Select(z => new
                     {
                         z.ClassStepPriceId,
@@ -122,7 +105,7 @@ namespace Edu.WebApi.Controllers.Course
                     ClassPlanList = x.ClassPlanList.Select(z => new
                     {
                         z.WeekDay,
-                        ClassDate = x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate ? z.ClassDate.ToString("yyyy-MM-dd") : ""
+                        ClassDate = x.ClassStyle == ClassStyleEnum.FixedDate ? Common.ConvertHelper.FormatDate(z.ClassDate) : ""
                     }),
                     x.SchoolName,
                     UpdateTime = Common.ConvertHelper.FormatTime(x.UpdateTime),