1

Edu.Module.Course/OrderModule.cs

@@ -1225,6 +1225,8 @@ namespace Edu.Module.Course
                 };
                 flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
 
+
+
                 #region 记录日志信息
                 LogContent = $"修改日语培训订单【{demodel.OrderId}】";
                 if (orderModel.GuestNum != demodel.GuestNum)
@@ -1324,6 +1326,7 @@ namespace Edu.Module.Course
                         }
                     }
                 }
+
             }
             else
             {
@@ -1636,7 +1639,7 @@ namespace Edu.Module.Course
                             WeChatNo = item.WeChatNo,
                             TotalChapterNo = MaxChapterNo,
                             StudentId = item.StuId,
-                            ClassUnitPrice = Math.Round(((demodel.PreferPrice - demodel.TextbookFee - demodel.CoursewareFee) / demodel.TotalClassHours), 2),//课时单价  （应收总金额-教材费-课件费）/总课时
+                            ClassUnitPrice = Math.Round(((demodel.PreferPrice - demodel.TextbookFee - demodel.CoursewareFee) / demodel.TotalClassHours), 6),//课时单价  （应收总金额-教材费-课件费）/总课时
                         };
                         SetOrderGuestInfo(guestModel, out string Nmessage);
 
@@ -2197,6 +2200,27 @@ namespace Edu.Module.Course
                 };
                 flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));//更新订单信息
 
+                #region 更新Order_Guest中的有效课时和课时单价  2024-09-06 add by:W
+                if (flag)
+                {
+                    foreach (var item in glist)
+                    {
+                        item.TotalHours = demodel.TotalClassHours;
+                        item.ClassUnitPrice = Math.Round(((demodel.PreferPrice - demodel.TextbookFee - demodel.CoursewareFee) / demodel.TotalClassHours), 6);//课时单价  （应收总金额-教材费-课件费）/总课时
+                        decimal validClassHours = Math.Round(((demodel.Income + demodel.PlatformTax - demodel.Refund - demodel.TextbookFee - demodel.CoursewareFee) / item.ClassUnitPrice), 2);
+                        item.ValidClassHours = validClassHours < item.CompleteHours ? item.CompleteHours : validClassHours;//有效课时  =    (实收+手续费-退款 - 课件费 - 教材费)/课时单价  ；   如果  有效课时 < 已完成课时 ，有效课时  =   已完成课时
+                        Dictionary<string, object> keyValuesOG = new Dictionary<string, object>()
+                        {
+                            { nameof(RB_Order_Guest_ViewModel.TotalHours),item.TotalHours},
+                            { nameof(RB_Order_Guest_ViewModel.ClassUnitPrice),item.ClassUnitPrice},
+                            { nameof(RB_Order_Guest_ViewModel.ValidClassHours),item.ValidClassHours},
+                        };
+                        order_GuestRepository.Update(keyValuesOG, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), item.Id));
+                    }
+                }
+
+                #endregion
+
                 #region 记录日志信息
                 LogContent = $"修改日语培训订单【{demodel.OrderId}】";
                 if (orderModel.GuestNum != demodel.GuestNum)
@@ -2633,7 +2657,7 @@ namespace Edu.Module.Course
                             WeChatNo = item.WeChatNo,
                             TotalChapterNo = MaxChapterNo,
                             StudentId = item.StuId,
-                            ClassUnitPrice = Math.Round(((demodel.PreferPrice - demodel.TextbookFee - demodel.CoursewareFee) / demodel.TotalClassHours), 2),//课时单价  （应收总金额-教材费-课件费）/总课时
+                            ClassUnitPrice = Math.Round(((demodel.PreferPrice - demodel.TextbookFee - demodel.CoursewareFee) / demodel.TotalClassHours), 6),//课时单价  （应收总金额-教材费-课件费）/总课时
                         };
                         SetOrderGuestInfo(guestModel, out string Nmessage);
 
@@ -3016,7 +3040,7 @@ namespace Edu.Module.Course
                     {
                         foreach (var item in demodel.OrderCourseList)
                         {
-                            
+
                             item.OrderId = demodel.OrderId;
                             item.Class_Price = demodel?.Class_Price ?? 0;
                             item.Unit_Price = demodel?.Unit_Price ?? 0;
@@ -5283,7 +5307,7 @@ namespace Edu.Module.Course
                     keyValues.Add(nameof(RB_Order_Guest.DropOutRemark), "有效课时大于完成课时,恢复学员状态!");
                     LogContent = gmodel.GuestName + "有效课时大于完成课时,系统恢复学员状态!";
                 }
-                if (isRefund ==1)
+                if (isRefund == 1)
                 {
                     if (gmodel.GuestState != GuestStateEnum.DropOut)
                     {
@@ -5316,7 +5340,8 @@ namespace Edu.Module.Course
                         }
                     };
                 bool gflag = order_GuestRepository.Update(keyValues, wheres);
-                if (isRefund == 1 && gflag) {
+                if (isRefund == 1 && gflag)
+                {
                     decimal NewPreferPrice = omodel.Income + omodel.PlatformTax - omodel.Refund + omodel.DiscountMoney;
                     Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
                         { nameof(RB_Order.OrderState),(int)OrderStateEnum.DropOut},
@@ -5344,7 +5369,7 @@ namespace Edu.Module.Course
                     });
                 }
             }
-            
+
             //培训/留学订单  直接验证 订单的应收 大于等于实收             
             if (omodel.PreferPrice - omodel.DiscountMoney == money && money > 0)
             {