页面修改

Edu.Module.Course/ClassModule.cs

@@ -1470,10 +1470,17 @@ namespace Edu.Module.Course
                     {
                         //更新学员完成课时
                         var completeHours = (oldModel?.FinishClassHours ?? 0) + item.CurrentDeductionHours;
+                    
                         Dictionary<string, object> orderFileds = new Dictionary<string, object>()
                         {
                             {nameof(RB_Order_Guest_ViewModel.CompleteHours),completeHours }
                         };
+                        //已上课时>=有效课时，如果是，修改学员状态为停课，并且备注“有效课时消耗完毕，系统自动停课”
+                        if (completeHours > guestModel.ValidClassHours)
+                        {
+                            orderFileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), 5);
+                            orderFileds.Add(nameof(RB_Order_Guest_ViewModel.DropOutRemark), "有效课时消耗完毕，系统自动停课");
+                        }
                         flag = order_GuestRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), item.OrderGuestId));
                         //缺勤和请假
                         if (item.CheckStatus == 1 || item.CheckStatus == 2)

Edu.Module.Course/OrderModule.cs

@@ -2304,11 +2304,13 @@ namespace Edu.Module.Course
                 LogContent = $"，更新退款【{refund}】";
             }
             else { return false; }
-            List<WhereHelper> wheres = new List<WhereHelper>() {
-                new WhereHelper(){
+            List<WhereHelper> wheres = new List<WhereHelper>() 
+            {
+                new WhereHelper()
+                {
                      FiledName=nameof(RB_Order_ViewModel.OrderId),
-                      FiledValue=orderId,
-                       OperatorEnum=OperatorEnum.Equal
+                     FiledValue=orderId,
+                     OperatorEnum=OperatorEnum.Equal
                 }
             };
             bool flag = orderRepository.Update(keyValues, wheres);
@@ -2550,13 +2552,22 @@ namespace Edu.Module.Course
                 }
                 decimal validClassHours = cmodel.Unit_Price > 0 ? Math.Round(cmodel.Income / cmodel.Unit_Price, 2, MidpointRounding.AwayFromZero) : 0;
 
-                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                {
                     { nameof(RB_Order_Guest.ValidClassHours),validClassHours}
                 };
-                List<WhereHelper> wheres = new List<WhereHelper>() {
-                    new WhereHelper(){
-                         FiledName=nameof(RB_Order_Guest.Id),
-                          FiledValue=guestId,
+                //HK2021-07-19新增【有效课时大于完成课时修改学员状态为正常】
+                if (gmodel.CompleteHours < validClassHours)
+                {
+                    keyValues.Add(nameof(RB_Order_Guest.GuestState), 1);
+                    keyValues.Add(nameof(RB_Order_Guest.DropOutRemark), "有效课时大于完成课时,恢复学员状态!");
+                }
+                List<WhereHelper> wheres = new List<WhereHelper>() 
+                {
+                    new WhereHelper()
+                    {
+                        FiledName=nameof(RB_Order_Guest.Id),
+                        FiledValue=guestId,
                         OperatorEnum= OperatorEnum.Equal
                     }
                 };

Edu.Module.EduTask/OrderChangeModule.cs

@@ -209,7 +209,7 @@ namespace Edu.Module.EduTask
                     var guestModel = guestRepository.GetEntity(orderChangeModel.OrderGuestId);
                     //计算课时单价
                     //老订单应收
-                    decimal oldPreferPrice = oldOrderModel.PreferPrice / guestModel.TotalHours * guestClassHours.FinishClassHours;
+                    decimal oldPreferPrice = Math.Round(oldOrderModel.PreferPrice / oldOrderModel.GuestNum / guestModel.TotalHours * guestClassHours.FinishClassHours,2);
                     //新订单应收
                     decimal newPreferPrice = oldOrderModel.PreferPrice - oldPreferPrice;
                     //退款

Edu.Module.User/ManagerModule.cs

@@ -92,7 +92,7 @@ namespace Edu.Module.User
                     { nameof(RB_Manager_ViewModel.Education),model.Education },
                     { nameof(RB_Manager_ViewModel.Email),model.Email },
                 };
-               
+
                 #region 日志
                 string logContent = "";
                 if (model.MName != oldModel.MName)
@@ -145,7 +145,7 @@ namespace Edu.Module.User
                     userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.MId, AccountTypeEnum.Admin);
                 }
                 #endregion
-              
+
                 flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId));
             }
             else
@@ -153,7 +153,7 @@ namespace Edu.Module.User
                 var newId = managerRepository.Insert(model);
                 model.MId = newId;
                 flag = newId > 0;
-                userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户",  newId, AccountTypeEnum.Admin);
+                userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户", newId, AccountTypeEnum.Admin);
             }
             if (flag)
             {
@@ -406,8 +406,6 @@ namespace Edu.Module.User
             return flag;
         }
 
-
-
         /// <summary>
         /// 根据学生id获取学生对应的销售
         /// </summary>
@@ -417,5 +415,20 @@ namespace Edu.Module.User
         {
             return managerRepository.GetManagerListByStuId(Student_Id, Group_Id);
         }
+
+        /// <summary>
+        /// 修改员工类型
+        /// </summary>
+        /// <param name="sourceAccountType"></param>
+        /// <param name="targetAccountType"></param>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [TransactionCallHandler]
+        public virtual bool SetEmployeeTypeModule(AccountTypeEnum sourceAccountType, AccountTypeEnum targetAccountType, int Id)
+        {
+            bool flag = false;
+
+            return flag;
         }
+    }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -167,6 +167,7 @@ namespace Edu.WebApi.Controllers.Course
                     item.ClassName,
                     item.CouseId,
                     item.CourseName,
+                    item.Teacher_Id,
                     OpenTime = Common.ConvertHelper.FormatDate(item.OpenTime),
                     PlanList = planList
                 };

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -72,6 +72,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.CouseId,
                     x.CourseFeature,
                     x.ClassHours,
+                    x.Teacher_Id,
                     x.TeacherName,
                     x.TeacherHead,
                     x.RoomName,

Edu.WebApi/Controllers/User/UserController.cs

@@ -1530,5 +1530,21 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
         #endregion
+
+        #region 调整员工类型
+
+        /// <summary>
+        /// 调整员工类型
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetEmployeeType()
+        {
+            var sourceAccountType = (AccountTypeEnum)base.ParmJObj.GetInt("AccountType");
+            var Id = base.ParmJObj.GetInt("Id");
+            var targetAccountType = (AccountTypeEnum)base.ParmJObj.GetInt("TargetAccountType");
+            var flag = managerModule.SetEmployeeTypeModule(sourceAccountType, targetAccountType, Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
     }
 }
\ No newline at end of file