页面修改

Edu.Module.Course/EmployeeBonusModule.cs

@@ -357,9 +357,10 @@ namespace Edu.Module.Course
         /// <param name="saleId"></param>
         private void CalcPersionBonusModule(RB_Personnel_Period period, RB_Bonus_PlanExtend item, int GroupId, string startDate, string endDate, int saleId)
         {
+          
             var orderList = GetSaleOrderList(item, GroupId,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList,out int IsOpenOrder);
-            var curNum = orderList?.Sum(qitem => qitem.GuestNum) ?? 0;
-            var curOrderMoney = orderList?.Sum(qitem => qitem.OrderMoney) ?? 0;
+            var curNum = orderList?.Where(qitem => !item.NotUseCourseIds.Contains(qitem.CourseId.ToString())).Sum(qitem => qitem.GuestNum) ?? 0;
+            var curOrderMoney = orderList?.Where(qitem=>!item.NotUseCourseIds.Contains(qitem.CourseId.ToString())).Sum(qitem => qitem.OrderMoney) ?? 0;
 
             //查询未平账的人员
             var saleBonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
@@ -553,18 +554,15 @@ namespace Edu.Module.Course
                 orderList = orderList?.Where(qitem => item.UseCourseIds.Contains(qitem.CourseId.ToString()))?.ToList();
             }
             isOpenOrder= orderList.Count>0?1:0;
-            //不适用课程
-            if (!string.IsNullOrEmpty(item.NotUseCourseIds))
-            {
-                orderList = orderList?.Where(qitem => !item.NotUseCourseIds.Contains(qitem.CourseId.ToString()))?.ToList();
-            }
+            
             //按照年份、月份统计订单人数和金额
             var groupList = orderList
-                 .GroupBy(qitem => new { qitem.CreateTime.Year, qitem.CreateTime.Month })
+                 .GroupBy(qitem => new { qitem.CreateTime.Year, qitem.CreateTime.Month,qitem.CourseId, })
                  .Select(qitem => new
                  {
                      qitem.Key.Year,
                      qitem.Key.Month,
+                     qitem.Key.CourseId,
                      GuestNum = qitem.Sum(s => s.GuestNum),
                      OrderMoney = qitem.Sum(s => s.Income - s.Refund - s.PlatformTax)
                  });
@@ -576,7 +574,8 @@ namespace Edu.Module.Course
                     Year = gItem.Year,
                     Month = gItem.Month,
                     GuestNum = gItem.GuestNum,
-                    OrderMoney = gItem.OrderMoney
+                    OrderMoney = gItem.OrderMoney,
+                    CourseId=gItem.CourseId,
                 });
             }
             return list;
@@ -689,9 +688,9 @@ namespace Edu.Module.Course
                         {
                             string endDate = Common.ConvertHelper.FormatDate(endTime);
                             var orderList = GetSaleOrderList(item, user.Group_Id,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList,out int IsOpenOrder);
-                            monthData.GuestNum = orderList?.Sum(qitem => qitem.GuestNum) ?? 0;
+                            monthData.GuestNum = orderList?.Where(qitem=>!item.NotUseCourseIds.Contains(qitem.CourseId.ToString())).Sum(qitem => qitem.GuestNum) ?? 0;
                             monthData.OrderCount = allOrderList?.Count() ?? 0;
-                            monthData.ReachCount = item.MonthGoalMoney > (orderList?.Sum(qitem => qitem.OrderMoney) ?? 0) ? 1 : 0;
+                            monthData.ReachCount = item.MonthGoalMoney > (orderList?.Where(qitem=>!item.NotUseCourseIds.Contains(qitem.CourseId.ToString()))?.Sum(qitem => qitem.OrderMoney) ?? 0) ? 1 : 0;
 
                             //当月梯度奖励金额
                             decimal CurRewardMoney = GetStepAwardAmount(item, monthData.GuestNum);
@@ -964,5 +963,10 @@ namespace Edu.Module.Course
         /// 订单金额
         /// </summary>
         public decimal OrderMoney { get; set; }
+
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
     }
 }