页面修改

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -225,5 +225,10 @@ namespace Edu.Model.ViewModel.Course
         /// 目标班级名称
         /// </summary>
         public string TargetClassName { get; set; }
+
+        /// <summary>
+        /// 订单拆分列表
+        /// </summary>
+       public List<RB_Order_SplitDetails_ViewModel> SplitDetailsList { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/OrderModule.cs

@@ -2151,15 +2151,27 @@ namespace Edu.Module.Course
                 {
                     idList.AddRange(targetOrderIdList);
                 }
+                List<RB_Order_SplitDetails_ViewModel> splitList = new List<RB_Order_SplitDetails_ViewModel>();
+                var firstOrderList =  Common.ConvertHelper.StringToList(string.Join(",", orderList.Where(qitem=>qitem.FirstOrderId>0).Select(x => x.FirstOrderId)));
+                if (firstOrderList != null && firstOrderList.Count > 0)
+                {
+                    splitList = splitDetailsRepository.GetOrderSplitDetailsListRepository(new RB_Order_SplitDetails_ViewModel()
+                    {
+                        Q_OldOrderIds = string.Join(",", firstOrderList)
+                    });
+                }
+
                 if (idList != null && idList.Count > 0)
                 {
                     string ids = string.Join(",", idList);
                     sourceTargetList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel { QOrderIds = ids });
                 }
+                
                 //获取备注列表
                 var remarkList = order_RemarkRepository.GetOrderRemarkListRepository(new RB_Order_Remark_ViewModel() { QOrderIds = orderIds });
                 //获取名单列表
                 var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
+                
                 //获取合同列表
                 var clist = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = demodel.Group_Id, OrderIds = orderIds, Status = -1 }).Where(x => x.Status != 4).ToList();
                 foreach (var item in orderList)
@@ -2172,6 +2184,7 @@ namespace Edu.Module.Course
                     {
                         item.TargetClassName = sourceTargetList?.Where(qitem => qitem.OrderId == item.TargetOrderId)?.FirstOrDefault()?.ClassName;
                     }
+                    item.SplitDetailsList = splitList.Where(qitem => qitem.OldOrderId == item.OrderId || qitem.OldOrderId == item.FirstOrderId)?.ToList() ?? new List<RB_Order_SplitDetails_ViewModel>();
                     item.SaleRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 1).ToList();
                     item.TeacherRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 2).ToList();
                     item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList();

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -239,7 +239,7 @@ namespace Edu.WebApi.Controllers.Course
                         x.UpOrderId,
                         x.VisitorReserveId,
                         x.RenewOrderId,
-                  
+                        x.SplitDetailsList,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -1265,6 +1265,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.RenewOrderId,
                     x.FirstOrderId,
                     x.IsBackClass,
+                    x.SplitDetailsList,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,
@@ -1427,6 +1428,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.UpOrderId,
                     x.VisitorReserveId,
                     x.RenewOrderId,
+                    x.SplitDetailsList,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,