页面修

Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs

@@ -123,5 +123,10 @@ namespace Edu.Model.Entity.Bonus
 		/// 以前月份的冲抵金额
 		/// </summary>
 		public decimal BeforeMoney { get; set; }
+
+		/// <summary>
+		/// 当月人头奖励配置数据Json格式
+		/// </summary>
+		public string HisBonusData { get; set; }
 	}
 }

Edu.Model/Entity/Bonus/RB_Personnel_BonusLog.cs

@@ -36,5 +36,10 @@ namespace Edu.Model.Entity.Bonus
 		/// 日志内容
 		/// </summary>
 		public string LogContent { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
 	}
 }

Edu.Model/ViewModel/Bonus/RB_Personnel_BonusLog_Extend.cs

@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.Bonus
         /// 奖励主表编号【查询使用】
         /// </summary>
         public string QBonusIds { get; set; }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
     }
 }

Edu.Model/ViewModel/Bonus/RB_Personnel_Bonus_Extend.cs

@@ -40,4 +40,51 @@ namespace Edu.Model.ViewModel.Bonus
         /// </summary>
         public string QPeriodIds { get; set; }
     }
+
+    /// <summary>
+    /// 当月人头奖励配置数据
+    /// </summary>
+    public class CurrentMonthBonusData 
+    {
+        /// <summary>
+        /// 开单奖金
+        /// </summary>
+        public decimal OpenBonus { get; set; }
+
+        /// <summary>
+        /// 每5条线索奖金
+        /// </summary>
+        public decimal ClueNumSalary { get; set; }
+
+        /// <summary>
+        /// 当月目标金额
+        /// </summary>
+        public decimal MonthGoalMoney { get; set; }
+
+        /// <summary>
+        /// 人头梯度详情
+        /// </summary>
+        public List<CurrentMonthBonusDataDetails> DetailList { get; set; }
+    }
+
+    /// <summary>
+    /// 当月人头奖励梯度配置数据
+    /// </summary>
+    public class CurrentMonthBonusDataDetails
+    {
+        /// <summary>
+		/// 开始人数
+		/// </summary>
+		public decimal StartNum { get; set; }
+
+        /// <summary>
+        /// 结束人数
+        /// </summary>
+        public decimal EndNum { get; set; }
+
+        /// <summary>
+        /// 奖励金额
+        /// </summary>
+        public decimal Money { get; set; }
+    }
 }

Edu.Model/ViewModel/Bonus/RB_Personnel_Deduction_Extend.cs

@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.Bonus
         /// 奖励主表编号【查询使用】
         /// </summary>
         public string QBonusIds { get; set; }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
     }
 }
\ No newline at end of file

Edu.Module.Course/EmployeeBonusModule.cs

@@ -247,7 +247,9 @@ namespace Edu.Module.Course
 
                         var sumNum = sItem?.DetailList?.Sum(qitem => qitem.OrderGuestNum) ?? 0;
                         var sumOrderMoney = sItem?.DetailList?.Sum(qitem => qitem.OrderMoney);
-                        var curRewardMoney = GetStepAwardAmount(planModel, sumNum);
+                        //历史人头提成方案
+                        var hisModel = Common.Plugin.JsonHelper.DeserializeObject<CurrentMonthBonusData>(sItem.HisBonusData);
+                        var curRewardMoney = GetHisStepAwardAmount(hisModel, sumNum);
                         deductionMoney = sItem.CurRewardMoney - curRewardMoney;
                         //修改已发放
                         string _bonusLog = $"订单号变更:完成人数:{sItem.CurGuestNum}=>{sumNum},订单完成金额由:{sItem.CurOrderMoney}=>{sumOrderMoney}"
@@ -257,7 +259,7 @@ namespace Edu.Module.Course
                         {
                             {nameof(RB_Personnel_Bonus.CurGuestNum),sumNum },
                             {nameof(RB_Personnel_Bonus.CurOrderMoney),sumOrderMoney },
-                            {nameof(RB_Personnel_Bonus.IsReach),(sumOrderMoney>planModel.MonthGoalMoney?1:0) },
+                            {nameof(RB_Personnel_Bonus.IsReach),(sumOrderMoney>hisModel.MonthGoalMoney?1:0) },
                         };
                         decimal newOpenBonus = 0;
                         //当月有开单奖金且没有有效订单
@@ -274,6 +276,29 @@ namespace Edu.Module.Course
             }
         }
 
+        /// <summary>
+        /// 获取历史梯度奖励金额
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="GuestNum"></param>
+        /// <returns></returns>
+        private decimal GetHisStepAwardAmount(CurrentMonthBonusData item, int GuestNum)
+        {
+            decimal awardAmount = 0;
+            if (item != null && item.DetailList != null && item.DetailList.Count > 0)
+            {
+                for (var i = 0; i < item.DetailList.Count; i++)
+                {
+                    var tempNum = item.DetailList[i];
+                    if (tempNum.StartNum <= GuestNum && GuestNum <= tempNum.EndNum)
+                    {
+                        awardAmount = tempNum.Money;
+                    }
+                }
+            }
+            return awardAmount;
+        }
+
         /// <summary>
         /// 计算人员业绩
         /// </summary>
@@ -322,6 +347,26 @@ namespace Edu.Module.Course
                 ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0
             };
             pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0;
+
+            //历史提成数据
+            var CurrentMonthBonusData = new CurrentMonthBonusData()
+            {
+                OpenBonus = item.OpenBonus,
+                ClueNumSalary = item.ClueNumSalary,
+                MonthGoalMoney = item.MonthGoalMoney,
+                DetailList = new List<CurrentMonthBonusDataDetails>()
+            };
+            foreach (var sItem in item.DetailList)
+            {
+                CurrentMonthBonusData.DetailList.Add(new CurrentMonthBonusDataDetails()
+                {
+                    StartNum = sItem.StartNum,
+                    EndNum = sItem.EndNum,
+                    Money = sItem.Money
+                });
+            }
+            pModel.HisBonusData = Common.Plugin.JsonHelper.Serialize(CurrentMonthBonusData);
+            
             //当月总业绩
             var totalMoney = (pModel.CurRewardMoney + pModel.OpenBonus  + pModel.ClueNumSalary);
             if (totalMoney >= chaE)
@@ -358,8 +403,13 @@ namespace Edu.Module.Course
                                 {nameof(RB_Personnel_Bonus_Extend.FinishDeductionMoney),(sItem?.FinishDeductionMoney??0)+sItem.DeductionMoney }
                             };
                             personnel_BonusRepository.Update(fileds, new WhereHelper(nameof(RB_Personnel_Bonus_Extend.Id), sItem.Id));
+                            //冲抵以前日志
                             string logContent = pModel.YearNum + "年" + pModel.MonthNum + "月,完成抵扣金额" + sItem.DeductionMoney;
                             personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, 0, logContent);
+
+                            //添加本月的日志
+                            string logContent2= "抵扣"+sItem.YearNum + "年" + sItem.MonthNum + "月, 人头奖励" + sItem.DeductionMoney;
+                            personnel_BonusLogRepository.AddPersonnelBonusLogRepository(pModel.Id, 1, 0, logContent2);
                             tempChaE -= sItem.DeductionMoney;
                         }
                         else
@@ -380,6 +430,10 @@ namespace Edu.Module.Course
                             personnel_BonusRepository.Update(fileds, new WhereHelper(nameof(RB_Personnel_Bonus_Extend.Id), sItem.Id));
                             string logContent = pModel.YearNum + "年" + pModel.MonthNum + "月,抵扣金额" + tempChaE;
                             personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, 0, logContent);
+
+                            //添加本月的日志
+                            string logContent2 = "抵扣" + sItem.YearNum + "年" + sItem.MonthNum + "月, 人头奖励" + tempChaE;
+                            personnel_BonusLogRepository.AddPersonnelBonusLogRepository(pModel.Id, 1, 0, logContent2);
                             tempChaE = 0;
                         }
                     }

Edu.Repository/Bonus/RB_Personnel_BonusLogRepository.cs

@@ -66,7 +66,8 @@ WHERE 1=1
                 BonusId = BonusId,
                 LogType = LogType,
                 OrderId = OrderId,
-                LogContent = LogContent
+                LogContent = LogContent,
+                CreateTime=DateTime.Now,
             };
             var newId = base.Insert(newModel);
             return newId > 0;