1

Edu.Module.Course/OrderModule.cs

@@ -665,7 +665,7 @@ namespace Edu.Module.Course
         /// </summary>
         /// <returns></returns>
         public bool UpdateClassOrderCommissionRate() {
-            var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = 100000, OrderType = OrderTypeEnum.CourseOrder, Q_OrderState = 1 });
+            var orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = 100000, OrderType = OrderTypeEnum.CourseOrder, Q_OrderState = 1 });
             foreach (var item in orderList) {
                 //根据班级查询课程
                 var classModel = classRepository.GetEntity(item.ClassId);

Edu.Module.Course/SellCommissionModule.cs

@@ -375,7 +375,7 @@ namespace Edu.Module.Course
                 string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
                 var CheckList = class_CheckRepository.GetClassStudentHoursListForOrderMonth(userInfo.Group_Id, orderIds);//使用月份统计的  方便下面每月消费课时计算
                 //查询订单下所有学员信息
-                var glist = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { Group_Id = userInfo.Group_Id, OrderIds = orderIds });
+                var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = userInfo.Group_Id, OrderIds = orderIds });
                 //查询这些订单 已发放提成记录
                 var dlist = sell_Commission_DetailsRepository.GetList(new RB_Sell_Commission_Details_ViewModel() { Group_Id = userInfo.Group_Id, OrderIds = orderIds });
                 #endregion

Edu.WebApi/Controllers/Course/SellCommissionController.cs

@@ -407,6 +407,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: (item.DeductionMoney).ToString("#0.00")){ },
                             new ExcelColumn(value: (item.DeductionExtraMoney).ToString("#0.00")){ },
                             new ExcelColumn(value: (item.CurrentPeriodMoney + item.CurrentExtraMoney + item.DeductionMoney + item.DeductionExtraMoney).ToString("#0.00")){ },
+                            new ExcelColumn(value: item.Periods){ },
                             new ExcelColumn(value: item.Remark){ },
                         },
                         ColumnHight = 30
@@ -436,6 +437,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: TotalMoney.ToString("#0.00")){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },