页面修改

Edu.Module.Course/ClassModule.cs

@@ -1855,9 +1855,23 @@ namespace Edu.Module.Course
         /// 删除班级关联课程
         /// </summary>
         /// <param name="Id"></param>
+        /// <param name="message"></param>
         /// <returns></returns>
-        public bool RemoveClassCourseModule(int Id)
+        public bool RemoveClassCourseModule(int Id, out string message)
         {
+            message = "";
+            var classCourse = class_CourseRepository.GetEntity(Id);
+            var orderList = orderRepository.GetList(new RB_Order_ViewModel()
+            {
+                ClassId = classCourse.ClassId,
+                CourseId = classCourse.CourseId,
+                OrderState = OrderStateEnum.Normal
+            });
+            if (orderList != null && orderList.Count > 0)
+            {
+                message = "此关联课程下有正常的订单,不能取消!";
+                return false;
+            }
             Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
                 {nameof(RB_Class_Course_Extend.Status),(int)DateStateEnum.Delete },

Edu.Repository/Course/RB_OrderRepository.cs

@@ -47,6 +47,10 @@ namespace Edu.Repository.Course
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.SourceId)} ={demodel.SourceId}";
             }
+            if (demodel.CourseId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.CourseId)} ={demodel.CourseId}";
+            }
             if (!string.IsNullOrEmpty(demodel.ClassIds)) 
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.ClassId)} in({demodel.ClassIds})";

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -582,8 +582,8 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull(message: "未获取到班级关联课程编号,请刷新页面重试!");
             }
-            bool flag = classModule.RemoveClassCourseModule(extModel.Id);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
+            bool flag = classModule.RemoveClassCourseModule(extModel.Id,out string message);
+            return flag ? ApiResult.Success(message:message) : ApiResult.Failed(message:message);
         }
         #endregion