页面修改

Edu.Module.EduTask/OrderChangeModule.cs

@@ -656,6 +656,7 @@ namespace Edu.Module.EduTask
                         JoinType = Common.Enum.Sale.OrderJoinTypeEnum.SplitOrder,
                         TargetJoinType = oldOrderModel.JoinType,
                         EffectTime = orderChangeModel.EffectiveDate,
+                        
                     };
                     orderModel.SourceOrderId = orderChangeModel.SourceOrderId;
                     orderModel.Group_Id = userInfo.Group_Id;
@@ -671,6 +672,15 @@ namespace Edu.Module.EduTask
                     orderModel.UpdateTime = DateTime.Now;
                     orderModel.OldGuestId = orderChangeModel.OrderGuestId;
                     orderModel.NewGuestTotalClassHours = Convert.ToInt32(courseValidHourse);
+                    orderModel.SourceOrderId = orderChangeModel.SourceOrderId;
+                    if (orderModel.JoinType != Common.Enum.Sale.OrderJoinTypeEnum.SplitOrder && orderModel.JoinType != Common.Enum.Sale.OrderJoinTypeEnum.TransOrder)
+                    {
+                        orderModel.FirstOrderId = oldOrderModel.OrderId;
+                    }
+                    else
+                    {
+                        orderModel.FirstOrderId = oldOrderModel.TargetOrderId;
+                    }
                     flag = orderModule.SetClassOrderCommonModule(orderModel, userInfo, false, out string message);
                     #endregion 
 
@@ -679,7 +689,7 @@ namespace Edu.Module.EduTask
                         //添加关联记录
                         splitDetailsRepository.Insert(new RB_Order_SplitDetails()
                         {
-                            OldOrderId = orderChangeModel.SourceOrderId,
+                            OldOrderId = orderModel.FirstOrderId,
                             S_OrderId = oldOrderModel.OrderId,
                             S_JoinType = oldOrderModel.JoinType,
                             S_ClassId = oldOrderModel.ClassId,
@@ -704,7 +714,6 @@ namespace Edu.Module.EduTask
                         Dictionary<string, object> guestFileds = new Dictionary<string, object>()
                         {
                              {nameof(RB_Order_Guest_ViewModel.TotalHours),guestModel.TotalHours-courseValidHourse },
-                             //{nameof(RB_Order_Guest_ViewModel.GuestState),7 },
                         };
                         if (flag)
                         {
@@ -774,8 +783,11 @@ namespace Edu.Module.EduTask
             }
             return flag;
         }
+       
         #endregion
 
+     
+
         /// <summary>
         /// 生成合同
         /// </summary>