Commit 65854b0e authored by 黄奎's avatar 黄奎

1111

parent 3e9457f5
...@@ -363,11 +363,10 @@ namespace Edu.Module.Course ...@@ -363,11 +363,10 @@ namespace Edu.Module.Course
/// <param name="saleId"></param> /// <param name="saleId"></param>
private void CalcPersionBonusModule(RB_Personnel_Period period, RB_Bonus_PlanExtend item, int GroupId, string startDate, string endDate, int saleId) 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 orderList = GetSaleOrderList(item, GroupId,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList,out int IsOpenOrder);
var curNum = orderList?.Where(qitem => !item.NotUseCourseIds.Contains(qitem.CourseId.ToString())).Sum(qitem => qitem.GuestNum) ?? 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 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() var saleBonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
{ {
...@@ -393,7 +392,6 @@ namespace Edu.Module.Course ...@@ -393,7 +392,6 @@ namespace Edu.Module.Course
CurGuestNum = curNum, CurGuestNum = curNum,
CurOrderMoney = curOrderMoney, CurOrderMoney = curOrderMoney,
Group_Id = GroupId, Group_Id = GroupId,
CreateBy = 1, CreateBy = 1,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
UpdateBy = 1, UpdateBy = 1,
...@@ -401,15 +399,16 @@ namespace Edu.Module.Course ...@@ -401,15 +399,16 @@ namespace Edu.Module.Course
DeductionMoney = DeductionMoney, DeductionMoney = DeductionMoney,
OpenBonus = IsOpenOrder > 0 ? item.OpenBonus : 0, OpenBonus = IsOpenOrder > 0 ? item.OpenBonus : 0,
ClueNum = ClueCount, ClueNum = ClueCount,
//HK 03-21注释掉线索奖金
//ClueNumSalary = ClueCount > 5 ? item.ClueNumSalary : 0,
IsIssue = 0 IsIssue = 0
}; };
//HK 03-21注释掉线索奖金
//ClueNumSalary = ClueCount > 5 ? item.ClueNumSalary : 0,
pModel.ClueNumSalary = 0;
//HK 2022-04-14去掉 //HK 2022-04-14去掉
//pModel.CurRewardMoney = GetStepAwardAmount(item, curNum); //HK 2022-07-11恢复
pModel.CurRewardMoney = 0; pModel.CurRewardMoney = GetStepAwardAmount(item, curNum);
//pModel.CurRewardMoney = 0;
pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0; pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0;
//历史提成数据 //历史提成数据
var CurrentMonthBonusData = new CurrentMonthBonusData() var CurrentMonthBonusData = new CurrentMonthBonusData()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment