页面修改

Edu.Model/Entity/Bonus/RB_Personnel_BonusDetail.cs

@@ -22,6 +22,10 @@ namespace Edu.Model.Entity.Bonus
 		/// </summary>
 		public int BonusId { get; set; }
 
+		/// <summary>
+		/// 订单编号
+		/// </summary>
+		public int OrderId { get; set; }
 
 		/// <summary>
 		/// 订单人数

Edu.Module.Course/EmployeeBonusModule.cs

@@ -39,18 +39,30 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
 
+        /// <summary>
+        /// 开始月份
+        /// </summary>
+        private int StartYear = 2021;
+
+        /// <summary>
+        /// 结束月份
+        /// </summary>
+        private int StartMoneh = 11;
+
         /// <summary>
         /// 生成业绩
         /// </summary>
         public void CreateEmployeeBonusModule(int GroupId)
         {
-            string endDate = "2021-12-31";
-            int CurrentYear = 2021;
-            int CurrentMonth = 12;
+            DateTime endTime = DateTime.Now.AddMonths(1).AddDays(-1);
+            int CurrentYear = endTime.Year;
+            int CurrentMonth = endTime.Month;
+            string endDate = Common.ConvertHelper.FormatDate(endTime);
             //人头配置列表
-            var planList=  bonus_PlanRepository.GetBounsPlanListRepository(new RB_Bonus_PlanExtend() {
-                Group_Id=GroupId
-            },isGetDetail:true);
+            var planList = bonus_PlanRepository.GetBounsPlanListRepository(new RB_Bonus_PlanExtend()
+            {
+                Group_Id = GroupId
+            }, isGetDetail: true);
 
 
             foreach (var item in planList)
@@ -58,7 +70,7 @@ namespace Edu.Module.Course
                 var saleList = Common.ConvertHelper.StringToList(item.SaleIds);
                 foreach (var saleId in saleList)
                 {
-                    var orderList = GetSaleOrderList(item, GroupId, endDate, saleId);
+                    var orderList = GetSaleOrderList(item, GroupId, endDate, saleId, out List<RB_Order_ViewModel> allOrderList);
                     var curNum = orderList?.Where(qitem => qitem.Year == CurrentYear && qitem.Month == CurrentMonth)?.Sum(qitem => qitem.GuestNum) ?? 0;
                     var curOrderMoney = orderList?.Where(qitem => qitem.Year == CurrentYear && qitem.Month == CurrentMonth)?.Sum(qitem => qitem.OrderMoney) ?? 0;
 
@@ -68,26 +80,26 @@ namespace Edu.Module.Course
                         RewardType = item.PlanType,
                         YearNum = CurrentYear,
                         MonthNum = CurrentMonth,
-                        EmployeeId=saleId,
-                        CurGuestNum= curNum,
-                        CurOrderMoney= curOrderMoney,
-                        Group_Id =GroupId,
-                        CurRewardMoney= GetStepAwardAmount(item, curNum),
-                        CreateBy=1,
-                        CreateTime=DateTime.Now,
-                        UpdateBy=1,
-                        UpdateTime=DateTime.Now,
+                        EmployeeId = saleId,
+                        CurGuestNum = curNum,
+                        CurOrderMoney = curOrderMoney,
+                        Group_Id = GroupId,
+                        CurRewardMoney = GetStepAwardAmount(item, curNum),
+                        CreateBy = 1,
+                        CreateTime = DateTime.Now,
+                        UpdateBy = 1,
+                        UpdateTime = DateTime.Now,
                     };
                     var newId = personnel_BonusRepository.Insert(pModel);
                     pModel.Id = newId;
-                    foreach (var oItem in orderList)
+                    foreach (var oItem in allOrderList)
                     {
                         var detail = new RB_Personnel_BonusDetail()
                         {
                             Id = 0,
                             BonusId = pModel.Id,
-                            OrderMoney=oItem.OrderMoney,
-                            GuestNum=oItem.GuestNum,
+                            OrderMoney = oItem.Income - oItem.Refund + oItem.PlatformTax,
+                            GuestNum = oItem.GuestNum,
                         };
                     }
                 }
@@ -100,7 +112,7 @@ namespace Edu.Module.Course
         /// <param name="item"></param>
         /// <param name="GuestNum"></param>
         /// <returns></returns>
-        private decimal GetStepAwardAmount(RB_Bonus_PlanExtend item,int GuestNum)
+        private decimal GetStepAwardAmount(RB_Bonus_PlanExtend item, int GuestNum)
         {
             decimal awardAmount = 0;
             if (item != null && item.DetailList != null && item.DetailList.Count > 0)
@@ -125,11 +137,11 @@ namespace Edu.Module.Course
         /// <param name="endDate"></param>
         /// <param name="SaleId"></param>
         /// <returns></returns>
-        private List<PersionOrderItem> GetSaleOrderList(RB_Bonus_PlanExtend item,int GroupId,string endDate,int SaleId)
+        private List<PersionOrderItem> GetSaleOrderList(RB_Bonus_PlanExtend item, int GroupId, string endDate, int SaleId, out List<RB_Order_ViewModel> orderList)
         {
             List<PersionOrderItem> list = new List<PersionOrderItem>();
             //所有当前人员订单列表
-            var orderList = orderRepository.GetAllBonusOrderListRepository(GroupId, endDate,SaleId);
+            orderList = orderRepository.GetAllBonusOrderListRepository(GroupId, endDate, SaleId);
             //适用课程
             if (!string.IsNullOrEmpty(item.UseCourseIds))
             {
@@ -147,8 +159,8 @@ namespace Edu.Module.Course
                  {
                      qitem.Key.Year,
                      qitem.Key.Month,
-                    GuestNum=qitem.Sum(s=>s.GuestNum),
-                    OrderMoney=qitem.Sum(s=>s.Income - s.Refund + s.PlatformTax)
+                     GuestNum = qitem.Sum(s => s.GuestNum),
+                     OrderMoney = qitem.Sum(s => s.Income - s.Refund + s.PlatformTax)
                  });
 
             foreach (var gItem in groupList)

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1192,7 +1192,7 @@ WHERE 1=1
 ");
             builder.AppendFormat(" AND o.OrderState IN({0},{1}) ", (int)OrderStateEnum.Normal, (int)OrderStateEnum.DropOut);
             builder.AppendFormat(" AND o.{0}={1} ", nameof(RB_Order_ViewModel.OrderType), (int)OrderTypeEnum.CourseOrder);
-            builder.AppendFormat(" AND o.CreateTime >= '2021-12-01' ");
+            builder.AppendFormat(" AND o.CreateTime >= '2021-11-01' ");
             //帐平
             builder.AppendFormat(" AND o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) ");
             if (group_Id > 0)