页面修改

Edu.Model/Entity/Course/RB_Order_Guest.cs

@@ -32,7 +32,7 @@ namespace Edu.Model.Entity.Course
         public string GuestName { get; set; }
 
         /// <summary>
-        /// 状态  1正常  2退学 3-申请中，4-驳回申请,5-停课，6-停课申请中，7-完结的订单
+        /// 状态  1正常  2退学 3-申请中，4-驳回申请,5-停课，6-停课申请中，7-完结的订单，8-转班申请中
         /// </summary>
         public int GuestState { get; set; }
 

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -87,6 +87,9 @@ namespace Edu.Model.ViewModel.Course
                     case 3: str = "申请退学中"; break;
                     case 4: str = "驳回申请"; break;
                     case 5: str = "停课"; break;
+                    case 6: str = "停课申请中"; break;
+                    case 7: str = "完结"; break;
+                    case 8: str = "转班申请中"; break;
                 }
                 return str;
             }

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -84,7 +84,8 @@ namespace Edu.Model.ViewModel.Course
                     case 4: str = "驳回申请"; break;
                     case 5: str = "停课"; break;
                     case 6: str = "停课申请中"; break;
-                    case 7: str = "转班申请中"; break;
+                    case 7: str = "完结"; break;
+                    case 8: str = "转班申请中"; break;
                 }
                 return str;
             }

Edu.Model/ViewModel/Course/RB_Student_Makeup_ViewModel.cs

@@ -49,6 +49,9 @@ namespace Edu.Model.ViewModel.Course
                     case 3: str = "申请退学中"; break;
                     case 4: str = "驳回申请"; break;
                     case 5: str = "停课"; break;
+                    case 6: str = "停课申请中"; break;
+                    case 7: str = "完结"; break;
+                    case 8: str = "转班申请中"; break;
                 }
                 return str;
             }

Edu.Module.EduTask/OrderChangeModule.cs

@@ -119,7 +119,7 @@ namespace Edu.Module.EduTask
                 flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message);
                 Dictionary<string, object> guestFileds = new Dictionary<string, object>()
                 {
-                    {nameof(RB_Order_Guest_ViewModel.GuestState),3}
+                    {nameof(RB_Order_Guest_ViewModel.GuestState),8}
                 };
                 if (flag)
                 {
@@ -209,12 +209,16 @@ namespace Edu.Module.EduTask
                     var guestModel = guestRepository.GetEntity(orderChangeModel.OrderGuestId);
                     //计算课时单价
                     //老订单应收
-                    decimal oldPreferPrice = Math.Round(oldOrderModel.PreferPrice / oldOrderModel.GuestNum / guestModel.TotalHours * guestClassHours.FinishClassHours,2);
-                    //新订单应收
-                    decimal newPreferPrice = oldOrderModel.PreferPrice - oldPreferPrice;
-                    //退款
-                    decimal backMoney = oldOrderModel.Income + oldOrderModel.PlatformTax - oldPreferPrice;
-
+                    //单个人员的课时单价
+                    var unitPrice= (oldOrderModel.Income + oldOrderModel.PlatformTax) / oldOrderModel.GuestNum / guestModel.TotalHours;
+                    //单人已完成应收
+                    var singleFinishPrice = Math.Round(guestClassHours.FinishClassHours * unitPrice, 2);
+                    //单人应收
+                    var singlePreferPrice = Math.Round(guestModel.TotalHours * unitPrice, 2);
+                    //原订单应收=原订单应收-单人应收+单人完成
+                    decimal oldPreferPrice = oldOrderModel.PreferPrice- singlePreferPrice+ singleFinishPrice;
+                    //新订单应收和退款一致
+                    decimal newPreferPrice = singlePreferPrice - singleFinishPrice;
                     #region 生成新订单
                     var orderModel = new RB_Order_ViewModel()
                     {
@@ -288,8 +292,8 @@ namespace Edu.Module.EduTask
 
                         if (flag)
                         {
-                            var RelevanceFrId = CreateExpenditure(backMoney,guestModel.Id,guestModel.GuestName, userInfo, oldOrderModel.ClassId, oldOrderModel.OrderId, out string msg1);
-                            var InCome = CreateInCome(backMoney, orderModel.NewGuestId, guestModel.GuestName, userInfo, orderModel.ClassId, orderModel.OrderId, RelevanceFrId, out string msg2);
+                            var RelevanceFrId = CreateExpenditure(newPreferPrice, guestModel.Id,guestModel.GuestName, userInfo, oldOrderModel.ClassId, oldOrderModel.OrderId, out string msg1);
+                            var InCome = CreateInCome(newPreferPrice, orderModel.NewGuestId, guestModel.GuestName, userInfo, orderModel.ClassId, orderModel.OrderId, RelevanceFrId, out string msg2);
                             flag = RelevanceFrId > 0 && InCome > 0;
                         }
                         #endregion

Edu.Repository/Course/RB_Student_BackClassRepository.cs

@@ -154,7 +154,7 @@ WHERE 1=1  ");
             int GuestState = 0;
             if (auditModel.AuditStatus == 2)
             {
-                GuestState = 1;
+                GuestState = 7;
             }
             if (auditModel.AuditStatus == 3)
             {