提交代码

Edu.Module.Course/OrderModule.cs

@@ -509,7 +509,7 @@ namespace Edu.Module.Course
                         return flag;
                     }
                 }
-                else if (demodel.JoinType == OrderJoinTypeEnum.TransOrder)
+                else if (demodel.JoinType == OrderJoinTypeEnum.TransOrder || demodel.JoinType== OrderJoinTypeEnum.SplitOrder)
                 {
                     //不验证应收
                 }

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -312,11 +312,15 @@ namespace Edu.Module.EduTask
                     if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.OrderTransClass)
                     {
                         string transClassIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
-                        orderTransList = order_ChangeRepository.GetOrderChangeListRepository(new RB_Order_Change_ViewModel()
+                        var tempList = order_ChangeRepository.GetOrderChangeListRepository(new RB_Order_Change_ViewModel()
                         {
                             QIds = transClassIds,
                             ChangeType = 1,
                         });
+                        if (tempList != null && tempList.Count > 0)
+                        {
+                            orderTransList.AddRange(tempList);
+                        }
                     }
                     #endregion
 
@@ -324,11 +328,15 @@ namespace Edu.Module.EduTask
                     if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.OrderSplitClass)
                     {
                         string transClassIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
-                        orderTransList = order_ChangeRepository.GetOrderChangeListRepository(new RB_Order_Change_ViewModel()
+                        var tempList = order_ChangeRepository.GetOrderChangeListRepository(new RB_Order_Change_ViewModel()
                         {
                             QIds = transClassIds,
                             ChangeType = 2,
                         });
+                        if (tempList != null && tempList.Count > 0)
+                        {
+                            orderTransList.AddRange(tempList);
+                        }
                     }
                     #endregion
                 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -778,7 +778,7 @@ namespace Edu.WebApi.Controllers.Course
             List<object> guestList = new List<object>();
             foreach (var item in orderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate)))
             {
-                if (item.JoinType ==  Common.Enum.Sale.OrderJoinTypeEnum.Normal|| item.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder || (item.JoinType ==  Common.Enum.Sale.OrderJoinTypeEnum.InsertClass && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime))))
+                if (item.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.InsertClass && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime)))
                 {
                     guestList.Add(new
                     {
@@ -796,9 +796,9 @@ namespace Edu.WebApi.Controllers.Course
                         item.CompleteHours,
                         item.StartClassHours,
                         item.JoinType,
-                        JoinTypeName=item.JoinType.ToName(),
+                        JoinTypeName = item.JoinType.ToName(),
                         item.TargetJoinType,
-                        TargetJoinTypeName=item.TargetJoinType.ToName(),
+                        TargetJoinTypeName = item.TargetJoinType.ToName(),
                         item.SourceOrderId,
                         item.TargetOrderId,
                         item.EffectStatus,
@@ -807,7 +807,39 @@ namespace Edu.WebApi.Controllers.Course
                         item.UpOrderId,
                         IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus ?? -1 : -1,
                         StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0,
-                        IsTemp=0,
+                        IsTemp = 0,
+                    });
+                }
+                else
+                {
+                    guestList.Add(new
+                    {
+                        UserIcon = "",
+                        item.Id,
+                        SexStr = item.Sex == 1 ? "男" : "女",
+                        item.GuestName,
+                        item.Age,
+                        CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
+                        item.Mobile,
+                        item.OrderId,
+                        item.CourseName,
+                        item.CourseId,
+                        item.TotalHours,
+                        item.CompleteHours,
+                        item.StartClassHours,
+                        item.JoinType,
+                        JoinTypeName = item.JoinType.ToName(),
+                        item.TargetJoinType,
+                        TargetJoinTypeName = item.TargetJoinType.ToName(),
+                        item.SourceOrderId,
+                        item.TargetOrderId,
+                        item.EffectStatus,
+                        item.EffectStatusStr,
+                        EffectTime = Common.ConvertHelper.FormatDate(item.EffectTime),
+                        item.UpOrderId,
+                        IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus ?? -1 : -1,
+                        StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0,
+                        IsTemp = 0,
                     });
                 }
             }

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -49,9 +49,11 @@ namespace Edu.WebApi.Controllers.EduTask
                 MoveType = base.ParmJObj.GetInt("MoveType"),
                 Remarks = base.ParmJObj.GetStringValue("Remarks")
             };
-            if (model.ClassId == 0)
+
+            if (model.ClassId <= 0)
             {
-                return ApiResult.Failed("请选择班级");
+                return ApiResult.ParamIsNull(message: "请选择要调整的班级!");
+
             }
             var classModel = classModule.GetClassModule(model.ClassId);
             string receiptFile = string.Empty;

Edu.WebApi/Controllers/EduTask/OrderChangeController.cs

@@ -181,5 +181,33 @@ namespace Edu.WebApi.Controllers.EduTask
             bool flag = orderChangeModule.SetOrderSplitModule(model, receiptFile, out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
+
+        /// <summary>
+        /// 订单拆分申请
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult TestUpdateOrderSplit()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var Type = base.ParmJObj.GetInt("Type");
+            bool flag = orderChangeModule.TestUpdateOrderSplitModule(Id, Type);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 回归原班
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RegressSourceClass()
+        {
+            var OrderId = base.ParmJObj.GetInt("OrderId");
+            var GuestId = base.ParmJObj.GetInt("GuestId");
+            var oldOrderId = base.ParmJObj.GetInt("oldOrderId");
+            var oldGuestId = base.ParmJObj.GetInt("oldGuestId");
+            bool flag = orderChangeModule.RegressSourceClassModule(OrderId, GuestId, oldOrderId, oldGuestId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }