页面修改

Edu.Model/ViewModel/Sell/RB_Bonus_PlanExtend.cs

@@ -50,6 +50,22 @@ namespace Edu.Model.ViewModel.Sell
         /// 不适用课程详情列表
         /// </summary>
         public List<CourseItem> NotUseCourseList { get; set; }
+
+        /// <summary>
+        /// 不适用课程列表
+        /// </summary>
+        public List<int> NotUseCourseIdList
+        {
+            get
+            {
+                List<int> list = new List<int>();
+                if (!string.IsNullOrEmpty(this.NotUseCourseIds))
+                {
+                    list = Common.ConvertHelper.StringToList(this.NotUseCourseIds);
+                }
+                return list;
+            }
+        }
     }
 
     /// <summary>

Edu.Module.Course/EmployeeBonusModule.cs

@@ -363,15 +363,14 @@ 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 tempOrderList = orderList?.Where(qitem => !item.NotUseCourseIds.Contains(qitem.CourseId.ToString()))?.ToList();
+            var tempOrderList = orderList?.Where(qitem => !item.NotUseCourseIdList.Contains(qitem.CourseId))?.ToList();
             var numList = tempOrderList
                 ?.GroupBy(qitem => new { qitem.Student_Id })
                 ?.Select(qitem => new { qitem.Key.Student_Id })
                 ;
             var curNum = numList?.Count() ?? 0;
-            var curOrderMoney = orderList?.Where(qitem=>!item.NotUseCourseIds.Contains(qitem.CourseId.ToString())).Sum(qitem => qitem.OrderMoney) ?? 0;
+            var curOrderMoney = orderList?.Where(qitem=>!item.NotUseCourseIdList.Contains(qitem.CourseId)).Sum(qitem => qitem.OrderMoney) ?? 0;
             
             //查询未平账的人员
             var saleBonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
@@ -517,7 +516,7 @@ namespace Edu.Module.Course
                     OrderState = oItem.OrderState,
                     OrderMoney = oItem.Income - oItem.Refund - oItem.PlatformTax,
                     OrderGuestNum = oItem.GuestNum,
-                    Remarks = (item.NotUseCourseIds.Contains(oItem.CourseId.ToString()) ? "【不适用】" : "") + courseRepository.GetEntity(oItem.CourseId)?.CourseName ?? "",
+                    Remarks = (item.NotUseCourseIdList.Contains(oItem.CourseId) ? "【不适用】" : "") + courseRepository.GetEntity(oItem.CourseId)?.CourseName ?? "",
                 };
                 var newDetailId = personnel_BonusDetailRepository.Insert(detailModel);
                 detailModel.Id = newDetailId;
@@ -706,9 +705,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?.Where(qitem=>!item.NotUseCourseIds.Contains(qitem.CourseId.ToString())).Sum(qitem => qitem.GuestNum) ?? 0;
+                            monthData.GuestNum = orderList?.Where(qitem=>!item.NotUseCourseIdList.Contains(qitem.CourseId)).Sum(qitem => qitem.GuestNum) ?? 0;
                             monthData.OrderCount = allOrderList?.Count() ?? 0;
-                            monthData.ReachCount = item.MonthGoalMoney > (orderList?.Where(qitem=>!item.NotUseCourseIds.Contains(qitem.CourseId.ToString()))?.Sum(qitem => qitem.OrderMoney) ?? 0) ? 1 : 0;
+                            monthData.ReachCount = item.MonthGoalMoney > (orderList?.Where(qitem=>!item.NotUseCourseIdList.Contains(qitem.CourseId))?.Sum(qitem => qitem.OrderMoney) ?? 0) ? 1 : 0;
 
                             //当月梯度奖励金额
                             decimal CurRewardMoney = GetStepAwardAmount(item, monthData.GuestNum);