Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/StudentBillModule.cs

@@ -91,6 +91,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly ClassModule classModule = new ClassModule();
 
+        /// <summary>
+        /// 课程优惠信息
+        /// </summary>
+        private readonly RB_Course_PreferentialRepository   course_PreferentialRepository = new RB_Course_PreferentialRepository();
+
         /// <summary>
         /// 获取学员退课单据分页列表
         /// </summary>
@@ -962,8 +967,33 @@ namespace Edu.Module.Course
         {
             List<object> list = new List<object>();
             var classList = classModule.GetClassPageListModule(pageIndex, pageSize, out rowsCount, query, isGetStepPrice: true);
+            List<RB_Course_Preferential_Extend> coursePriceList = new List<RB_Course_Preferential_Extend>();
+            if (classList != null && classList.Count > 0)
+            {
+                string courseIds = string.Join(",", classList.Select(qitem => qitem.CouseId));
+                coursePriceList= course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
+                {
+                    QCourseIds = courseIds
+                });
+            }
             foreach (var item in classList)
             {
+                var priceModel = coursePriceList?.Where(qitem => qitem.CourseId == item.CouseId && qitem.PriceDiscountType == CoursePriceDiscountEnum.Renewal)?.FirstOrDefault();
+                decimal SellPrice = item.SellPrice;
+                decimal OriginalPrice = item.SellPrice;
+                if (priceModel != null)
+                {
+                    if (priceModel.PriceType == 0)
+                    {
+                        SellPrice = Math.Round(SellPrice * (100 - priceModel.PriceMoney) / 100,2);
+                        OriginalPrice = Math.Round(SellPrice * (100 - priceModel.PriceMoney) / 100,2);
+                    }
+                    else
+                    {
+                        SellPrice = Math.Round(SellPrice - priceModel.PriceMoney,2);
+                        OriginalPrice = Math.Round(SellPrice - priceModel.PriceMoney, 2);
+                    }
+                }
                 var obj = new
                 {
                     item.ClassId,
@@ -973,8 +1003,8 @@ namespace Edu.Module.Course
                     item.TeacherName,
                     item.RoomName,
                     OpenTime = Common.ConvertHelper.FormatDate(item.OpenTime),
-                    item.OriginalPrice,
-                    item.SellPrice,
+                    OriginalPrice,
+                    SellPrice,
                     item.ClassPersion,
                     item.OrderStudentCount,
                     item.ClassStepPriceList,

Edu.Repository/Course/RB_CourseRepository.cs

@@ -142,7 +142,7 @@ WHERE 1=1
                     }
                 }
             }
-            return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+           return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 
         /// <summary>

Edu.Repository/Course/RB_Student_MakeupRepository.cs

@@ -96,7 +96,7 @@ WHERE 1=1
                 OrderGuestId = model.OrderGuestId
             };
             newModel.Id = CheckStudentMakeUpExistsRepository(model);
-            if (newModel.Id > 0)
+            if (newModel.Id <= 0)
             {
                 flag = base.Insert(newModel) > 0;
             }

Edu.Repository/User/RB_NoticeRepository.cs

@@ -160,7 +160,7 @@ namespace Edu.Repository.User
                 where += $@" and n.{nameof(RB_Notice.UpdateBy)} ={demodel.UpdateBy}";
             }
             if (!string.IsNullOrEmpty(demodel.To)) {
-                where += $@" and (FIND_IN_SET(d.DeptId,'{demodel.To}') or d.DeptId =-1)";
+                where += $@" and (FIND_IN_SET(d.DeptId,'{demodel.To}') or n.To =-1)";
             }
             if (!string.IsNullOrEmpty(demodel.LookTime))
             {

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -189,7 +189,7 @@ namespace Edu.WebApi.Controllers.Course
                 IsQTeacher = base.ParmJObj.GetInt("IsQTeacher"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
-            query.School_Id = base.UserInfo.School_Id;
+            //query.School_Id = base.UserInfo.School_Id;
             var list = courseModule.GetCoursePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {

Edu.WebApi/Controllers/Course/StuController.cs

@@ -209,6 +209,7 @@ namespace Edu.WebApi.Controllers.Course
                 VisitorReserveId=0,
                 IsRenewOrder=1,
             };
+            orderModel.RenewOrderId = OrderId;
             orderModel.Group_Id = base.UserInfo.Group_Id;
             orderModel.School_Id = base.UserInfo.School_Id;
             orderModel.Dept_Id = base.UserInfo.DeptId;