页面修改

Edu.Model/ViewModel/Course/RB_Class_Course_Extend.cs

@@ -29,5 +29,10 @@ namespace Edu.Model.ViewModel.Course
         /// 课程价格
         /// </summary>
         public decimal SellPrice { get; set; }
+
+        /// <summary>
+        /// 课程优惠价格信息
+        /// </summary>
+        public List<RB_Course_Preferential_Extend> CoursePriceList { get; set; }
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -250,7 +250,16 @@ namespace Edu.Module.Course
             var courseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { ClassId = classId });
             if (courseList != null)
             {
-                fileds.Add("otherCourse", courseList.Select(qitem => new { qitem.CourseId, qitem.CourseName, qitem.ClassHours, qitem.SellPrice }));
+                string courseIds = string.Join(",", courseList.Select(qitem => qitem.CourseId));
+                var coursePriceList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
+                {
+                    QCourseIds = courseIds
+                });
+                foreach (var item in courseList)
+                {
+                    item.CoursePriceList = coursePriceList?.Where(qitem => qitem.CourseId == item.CourseId)?.ToList() ?? new List<RB_Course_Preferential_Extend>();
+                }
+                fileds.Add("otherCourse", courseList.Select(qitem => new { qitem.CourseId, qitem.CourseName, qitem.ClassHours, qitem.SellPrice ,qitem.CoursePriceList}));
             }
             return fileds;
         }
@@ -310,30 +319,44 @@ namespace Edu.Module.Course
             {
                 CourseId = demodel.CourseId
             });
-            if (demodel.IsLessPrice == 1 && demodel.LessPrice > 0)
-            {
+            //课程优惠信息
+            decimal disMoney = 0;//课程最大优惠金额
+            decimal coursePrice = courseModel.SellPrice;//课程最低单据
+            var coursePreferentialModel = new RB_Course_Preferential_Extend();
             if (coursePreferentialList != null && coursePreferentialList.Count > 0)
             {
-                    var disModel = new RB_Course_Preferential_Extend();
                 if (demodel.GuestNum == 1)
                 {
-                        disModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault();
+                    coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault();
                 }
                 if (demodel.GuestNum >= 2)
                 {
-                        disModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault();
+                    coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault();
                 }
-                    decimal disMoney = 0;
-                    var saleCommissionType = disModel?.SaleCommissionType ?? 0;
+                var saleCommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
                 if (saleCommissionType == 0)
                 {
-                        var tempMoney = (courseModel?.SellPrice ?? 0) * (disModel?.SaleCommissionMoney ?? 0);
+                    var tempMoney = (courseModel?.SellPrice ?? 0) * (coursePreferentialModel?.SaleCommissionMoney ?? 0);
                     disMoney = tempMoney / Convert.ToDecimal(100);
                 }
                 else
                 {
-                        disMoney = disModel?.SaleCommissionMoney ?? 0;
+                    disMoney = coursePreferentialModel?.SaleCommissionMoney ?? 0;
+                }
+                var priceCommissionType = coursePreferentialModel?.PriceType??0;
+                if (priceCommissionType == 0)
+                {
+                    coursePrice = coursePrice * (100 - coursePreferentialModel.PriceMoney) / 100;
+                }
+                else
+                {
+                    coursePrice = coursePrice - coursePreferentialModel.PriceMoney;
                 }
+            }
+            if (demodel.IsLessPrice == 1 && demodel.LessPrice > 0)
+            {
+                if (coursePreferentialList != null && coursePreferentialList.Count > 0)
+                {
                     if (demodel.LessPrice > disMoney)
                     {
                         message = string.Format("优惠金额不能大于{0}", disMoney.ToString("0.00"));
@@ -394,20 +417,10 @@ namespace Edu.Module.Course
                 }
             }
 
-            decimal MinPrice = courseModel.SellPrice;
-            List<RB_Order_StepPrice_ViewModel> spList = new List<RB_Order_StepPrice_ViewModel>();
-            if (demodel.GuestNum > 1)
-            {
-                spList = order_StepPriceRepository.GetList(new RB_Order_StepPrice_ViewModel() { OrderId = demodel.OrderId });
-                if (spList.Any())
-                {
-                    MinPrice = spList.Where(x => demodel.GuestNum >= x.PersionNum).OrderByDescending(x => x.PersionNum).FirstOrDefault().PersionPrice;
-                }
-            }
             //没有总经理修改订单权限
             if (!isEditOrder)
             {
-                if (demodel.Unit_Price < MinPrice)
+                if (demodel.Unit_Price < coursePrice)
                 {
                     flag = false;
                     message = "成交单价不能小于最低价格";
@@ -415,7 +428,7 @@ namespace Edu.Module.Course
                 }
                 if (demodel.IsChaBan == 1)
                 {
-                    var newPreferPrice = Math.Round(courseModel.SellPrice / courseModel.ClassHours * (courseModel.ClassHours - demodel.StartClassHours)* demodel.GuestNum, 2);
+                    var newPreferPrice = Math.Round(coursePrice / courseModel.ClassHours * (courseModel.ClassHours - demodel.StartClassHours)* demodel.GuestNum, 2);
                     if (demodel.PreferPrice != (newPreferPrice - demodel.LessPrice))
                     {
                         flag = false;
@@ -553,19 +566,6 @@ namespace Edu.Module.Course
                 flag = OrderId > 0;
                 if (flag)
                 {
-                    //记录历史阶梯价格
-                    foreach (var item in spList)
-                    {
-                        order_StepPriceRepository.Insert(new Model.Entity.Course.RB_Order_StepPrice()
-                        {
-                            Id = 0,
-                            Group_Id = demodel.Group_Id,
-                            OrderId = OrderId,
-                            PersionNum = item.PersionNum,
-                            PersionPrice = item.PersionPrice,
-                            School_Id = demodel.School_Id
-                        });
-                    }
                     //记录订单备注
                     if (!string.IsNullOrEmpty(demodel.SaleRemark))
                     {