解决冲突

Edu.Module.Course/OrderModule.cs

@@ -480,7 +480,7 @@ namespace Edu.Module.Course
                         };
                         if (model.OrderType == OrderTypeEnum.CourseOrder)
                         {
-                            FormatOrderCommissionByCourse(ref commissionModel, model.CourseId, model.PreferPrice - model.DiscountMoney);
+                            FormatOrderCommissionByCourse(ref commissionModel, model.CourseId, model.PreferPrice - model.DiscountMoney, model.OrderCourseList);
                         }
                         else if (model.OrderType == OrderTypeEnum.StudyabroadOrder)
                         {
@@ -654,12 +654,15 @@ namespace Edu.Module.Course
             return list;
         }
 
-        public void FormatOrderCommissionByCourse(ref RB_Order_ReturnComission_ViewModel m, int courseId, decimal orderIncome)
+        public void FormatOrderCommissionByCourse(ref RB_Order_ReturnComission_ViewModel m, int courseId, decimal orderIncome, List<RB_Order_Course_ViewModel> orderCourseList = null)
         {
             var courseModel = courseRepository.GetEntity(courseId);
             //首先查询一下  订单是否关联多课程
-            var orderCourseList = order_CourseRepository.GetOrderCourseListRepository(new RB_Order_Course_ViewModel() { Group_Id = m.GroupId, OrderId = m.OrderId });
-            if (orderCourseList.Any() && orderCourseList.Count() > 1)
+            if (orderCourseList == null || !orderCourseList.Any())
+            {
+                orderCourseList = order_CourseRepository.GetOrderCourseListRepository(new RB_Order_Course_ViewModel() { Group_Id = m.GroupId, OrderId = m.OrderId });
+            }
+            if (orderCourseList != null && orderCourseList.Any() && orderCourseList.Count() > 1)
             {
                 //取最高等级的课程
                 var courseList = courseRepository.GetCourseListRepository(new RB_Course_ViewModel() { Group_Id = m.GroupId, QCourseIds = string.Join(",", orderCourseList.Select(x => x.CourseId)) });
@@ -2827,7 +2830,7 @@ namespace Edu.Module.Course
                 #endregion
 
                 // 处理返佣信息
-                //  System.Threading.Tasks.Task.Run(() => SetReturnOrderCommission(demodel));
+                System.Threading.Tasks.Task.Run(() => SetReturnOrderCommission(demodel));
             }
 
             #region 写日志