页面修改

Edu.Module.Course/OrderModule.cs

@@ -7,6 +7,7 @@ using Edu.Common.Enum.Course;
 using Edu.Common.Enum.Sale;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
+using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Log;
 using Edu.Model.ViewModel.StudyAbroad;
@@ -366,14 +367,33 @@ namespace Edu.Module.Course
             {
                 demodel.LessPrice = 0;
             }
+            var orderModel = new RB_Order();
+            if (demodel.OrderId > 0)
+            {
+                orderModel = orderRepository.GetEntity(demodel.OrderId);
+            }
 
-            int BNum = orderRepository.GetClassOrderPeopleNum(demodel.ClassId.ToString()).FirstOrDefault()?.GuestNum ?? 0;
-            if (BNum + demodel.GuestNum > classModel.ClassPersion)
+            if (demodel.OrderId > 0)
             {
-                flag = false;
-                message = "人数报超" + (classModel.ClassPersion - (BNum + demodel.GuestNum));
-                return flag;
+                int BNum = orderRepository.GetClassOrderPeopleNum(demodel.ClassId.ToString()).FirstOrDefault()?.GuestNum ?? 0;
+                if (BNum + demodel.GuestNum - orderModel.GuestNum > classModel.ClassPersion)
+                {
+                    flag = false;
+                    message = "人数报超" + (classModel.ClassPersion - (BNum + demodel.GuestNum - orderModel.GuestNum));
+                    return flag;
+                }
             }
+            else
+            {
+                int BNum = orderRepository.GetClassOrderPeopleNum(demodel.ClassId.ToString()).FirstOrDefault()?.GuestNum ?? 0;
+                if (BNum + demodel.GuestNum > classModel.ClassPersion)
+                {
+                    flag = false;
+                    message = "人数报超" + (classModel.ClassPersion - (BNum + demodel.GuestNum));
+                    return flag;
+                }
+            }
+
             decimal MinPrice = courseModel.SellPrice;
             List<RB_Order_StepPrice_ViewModel> spList = new List<RB_Order_StepPrice_ViewModel>();
             if (demodel.GuestNum > 1)
@@ -415,7 +435,6 @@ namespace Edu.Module.Course
             }
             if (demodel.OrderId > 0)
             {
-                var orderModel = orderRepository.GetEntity(demodel.OrderId);
                 if (orderModel == null)
                 {
                     flag = false;
@@ -449,6 +468,8 @@ namespace Edu.Module.Course
                     { nameof(RB_Order_ViewModel.EduOccupation),demodel.EduOccupation},
                     { nameof(RB_Order_ViewModel.IsLessPrice),demodel.IsLessPrice},
                     { nameof(RB_Order_ViewModel.LessPrice),demodel.LessPrice},
+                    { nameof(RB_Order_ViewModel.StartClassHours),demodel.StartClassHours},
+                    { nameof(RB_Order_ViewModel.CourseId),demodel.CourseId},
                 };
                 flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
                 if (flag)