Skip to content

E
Education
Commit bbd50152 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 4085149a
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 135 deletions
Edu.Module.Course/OrderModule.cs
View file @ bbd50152
......@@ -3394,6 +3394,8 @@ namespace Edu.Module.Course
var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
//获取合同列表
var clist = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = demodel.Group_Id, OrderIds = orderIds, Status = -1 }).Where(x => x.Status != 4).ToList();
//获取新的业绩提成
var achList = sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { Group_Id = demodel.Group_Id, OrderIds = orderIds });
foreach (var item in orderList)
{
item.SaleRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 1).ToList();
......@@ -3417,6 +3419,13 @@ namespace Edu.Module.Course
});
}
}
var achievementList = achList.Where(x => x.OrderId == item.OrderId).ToList();
if (achievementList.Any())
{
item.CommissionMoney = achievementList.Sum(x => x.GiveOutMoney);
item.YFCommission = achievementList.Sum(x => x.PushMoney);
}
}
}
return orderList;
......
Edu.Module.Course/SellAchievementsModule.cs
View file @ bbd50152
......@@ -512,6 +512,8 @@ namespace Edu.Module.Course
//当期累计消费课时
decimal currentTHours = CheckList.Where(x => x.OrderId == item.OrderId && x.MonthDate <= ETime).Sum(x => x.CurrentDeductionHours);
currentTHours = TotalHours;// 2022-04-06 ld 历史的直接全部发放
if (currentTHours >= TotalHours)
{
//课已完成 发放剩余所有的提成
......@@ -716,7 +718,7 @@ namespace Edu.Module.Course
}
if (teaOrderList.Any()) {
//这里应该要根据每个人的求
var teaList = teaOrderList.Select(x => x.HelpEnterId).ToList();
var teaList = teaOrderList.Select(x => x.HelpEnterId).Distinct().ToList();
foreach (var teaId in teaList)
{
var orderChildList = teaOrderList.Where(x => x.HelpEnterId == teaId).ToList();
......@@ -780,7 +782,7 @@ namespace Edu.Module.Course
if (sellOrderList.Any())
{
//这里应该要根据每个人的求
var enterList = sellOrderList.Select(x => x.EnterID).ToList();
var enterList = sellOrderList.Select(x => x.EnterID).Distinct().ToList();
foreach (var enterId in enterList)
{
var orderChildList = sellOrderList.Where(x => x.EnterID == enterId).ToList();
......@@ -842,7 +844,7 @@ namespace Edu.Module.Course
if (consultantOrderList.Any())
{
//这里应该要根据每个人的求
var consultantIdList = consultantOrderList.Select(x => x.CourseConsultantId).ToList();
var consultantIdList = consultantOrderList.Select(x => x.CourseConsultantId).Distinct().ToList();
foreach (var ConsultantId in consultantIdList)
{
//课程顾问
......@@ -1064,7 +1066,16 @@ namespace Edu.Module.Course
foreach (var AchModel in AchEmpList.Where(x => x.OrderId == item.OrderId))
{
var classModel = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault();
if (classModel == null) { continue; }
if (classModel == null) {
classModel = new RB_Class_ViewModel()
{
ClassType = 1,
OpenTime = Convert.ToDateTime(month + "-01")
};
if (item.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder) {
classModel.ClassType = 3;//留学
}
}
//当前已发提成
decimal SaleCommissioned = dlist.Where(x => x.OrderId == item.OrderId && x.UserId == AchModel.EmpId && x.UserType == AchModel.Type && x.IsDept == AchModel.IsDept).Sum(x => x.CurrentPeriodMoney);
......@@ -1170,8 +1181,8 @@ namespace Edu.Module.Course
{
ruleModel = rulelist.Where(x => x.Id == AchModel.RuleId).FirstOrDefault();
}
//验证是否满足 上课课时超15%
if (TotalLearn > TotalHours * (ruleModel.CourseRate /100))
//验证是否满足 上课课时超15%sss
if (TotalLearn >= TotalHours * (ruleModel.CourseRate /100) || item.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder)
{
//查询该订单 已发提成记录
//先查询销售的
......@@ -1847,38 +1858,44 @@ namespace Edu.Module.Course
}
if (teaOrderList.Any())
{
//计算老师业绩
decimal TotalYj = teaOrderList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => teaOrderList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
decimal YjMoney = TotalYj - bdMoney;//排除同行返佣
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
//这里应该要根据每个人的求
var teaList = teaOrderList.Select(x => x.HelpEnterId).Distinct().ToList();
foreach (var teaId in teaList)
{
foreach (var qitem in teaOrderList)
var orderChildList = teaOrderList.Where(x => x.HelpEnterId == teaId).ToList();
//计算老师业绩
decimal TotalYj = orderChildList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => orderChildList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
decimal YjMoney = TotalYj - bdMoney;//排除同行返佣
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
{
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
foreach (var qitem in orderChildList)
{
EmpId = qitem.HelpEnterId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 3,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYj
});
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.HelpEnterId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 3,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYj
});
}
}
}
}
......@@ -1904,38 +1921,44 @@ namespace Edu.Module.Course
}
if (teaOrderList.Any())
{
//计算老师业绩
decimal TotalYj = teaOrderList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => teaOrderList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
decimal YjMoney = TotalYj - bdMoney;//排除同行返佣
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
//这里应该要根据每个人的求
var teaList = teaOrderList.Select(x => x.HelpEnterId).Distinct().ToList();
foreach (var teaId in teaList)
{
foreach (var qitem in teaOrderList)
var orderChildList = teaOrderList.Where(x => x.HelpEnterId == teaId).ToList();
//计算老师业绩
decimal TotalYj = orderChildList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => orderChildList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
decimal YjMoney = TotalYj - bdMoney;//排除同行返佣
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
{
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
foreach (var qitem in orderChildList)
{
EmpId = qitem.HelpEnterId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 3,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYj
});
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.HelpEnterId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 3,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYj
});
}
}
}
}
......@@ -1963,41 +1986,47 @@ namespace Edu.Module.Course
}
if (sellOrderList.Any())
{
//计算市场业绩
decimal TotalYj = sellOrderList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => sellOrderList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
//查询老师的提成
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && sellOrderList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney);
decimal YjMoney = TotalYj - bdMoney - teacherMoney;//排除同行返佣 老师的提成
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
//这里应该要根据每个人的求
var enterList = sellOrderList.Select(x => x.EnterID).Distinct().ToList();
foreach (var enterId in enterList)
{
foreach (var qitem in sellOrderList)
var orderChildList = sellOrderList.Where(x => x.EnterID == enterId).ToList();
//计算市场业绩
decimal TotalYj = orderChildList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => orderChildList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
//查询老师的提成
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && orderChildList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney);
decimal YjMoney = TotalYj - bdMoney - teacherMoney;//排除同行返佣 老师的提成
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
{
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission - tCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
foreach (var qitem in orderChildList)
{
EmpId = qitem.EnterID,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 1,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj
});
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission - tCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.EnterID,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 1,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj
});
}
}
}
}
......@@ -2019,42 +2048,49 @@ namespace Edu.Module.Course
}
if (consultantOrderList.Any())
{
//课程顾问
//计算市场业绩
decimal TotalYj = consultantOrderList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => consultantOrderList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
//查询老师的提成
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && consultantOrderList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney);
decimal YjMoney = TotalYj - bdMoney - teacherMoney;//排除同行返佣 老师的提成
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
//这里应该要根据每个人的求
var consultantIdList = consultantOrderList.Select(x => x.CourseConsultantId).Distinct().ToList();
foreach (var ConsultantId in consultantIdList)
{
foreach (var qitem in consultantOrderList)
//课程顾问
var orderChildList = consultantOrderList.Where(x => x.CourseConsultantId == ConsultantId).ToList();
//课程顾问
//计算市场业绩
decimal TotalYj = orderChildList.Sum(x => x.PreferPrice - x.DiscountMoney);
//计算订单累计返佣
decimal bdMoney = bdList.Where(x => orderChildList.Select(y => y.OrderId).Contains(x.OrderId) && x.BalanceType == 1).Sum(x => x.Money);
//查询老师的提成
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && orderChildList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney);
decimal YjMoney = TotalYj - bdMoney - teacherMoney;//排除同行返佣 老师的提成
//根据业绩所在区间 查询比例
var rateModel = item.RateList.Where(x => x.StartValue < YjMoney && (x.EndValue >= YjMoney || x.EndValue == -1)).FirstOrDefault();
if (rateModel != null)
{
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission - tCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
foreach (var qitem in orderChildList)
{
EmpId = qitem.CourseConsultantId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj
});
//当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId && x.BalanceType == 1).Sum(x => x.Money);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney - bdCommission - tCommission;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.CourseConsultantId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = userInfo.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(orderYj * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
OrderSaleMoney = orderYj,
Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj
});
}
}
}
}
......
Edu.Module.Course/SellCommissionModule.cs
View file @ bbd50152
......@@ -571,6 +571,8 @@ namespace Edu.Module.Course
//查询这几个学生累计课时
decimal TotalLearn = CheckList.Where(x => x.OrderId == item.OrderId && x.MonthDate <= Convert.ToDateTime(EDate)).Sum(x => x.CurrentDeductionHours);//累计消费课时 (要查询当前发放提成日期) ld 07-02调整
decimal TotalHours = g3list.Sum(x => x.TotalHours);// 直接根据学生表 总课时计算 (必须签到课时 = 总课时 才发完最后一个月的)
TotalLearn = TotalHours; // 2022 -03-31 次月全额发放提成 ld；
#endregion
#region 额外提成
......@@ -1558,6 +1560,9 @@ namespace Edu.Module.Course
decimal currentHours = CheckList.Where(x => x.OrderId == item.OrderId && x.MonthDate >= STime && x.MonthDate <= ETime).Sum(x => x.CurrentDeductionHours);
//当期累计消费课时
decimal currentTHours = CheckList.Where(x => x.OrderId == item.OrderId && x.MonthDate <= ETime).Sum(x => x.CurrentDeductionHours);
currentTHours = TotalHours; // 2022 -04-06 次月全额发放提成 ld；
if (currentTHours >= TotalHours)
{
//课已完成 发放剩余所有的提成
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ bbd50152
......@@ -631,9 +631,11 @@ SELECT SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferP
SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice - o.Income + o.Refund - o.DiscountMoney - o.PlatformTax ELSE 0 END) AS DueInMoney,
SUM(CASE WHEN o.OrderState <> 3 THEN o.GuestNum ELSE 0 END) AS GuestNum,
SUM(CASE WHEN o.OrderState = 3 THEN o.GuestNum ELSE 0 END) AS CancelNum,
SUM(CASE WHEN o.CommissionMoney <> -1 AND o.OrderState <> 3 THEN o.CommissionMoney ELSE 0 END) AS CommissionMoney,
SUM(CASE WHEN ea.GiveOutMoney > 0 THEN ea.GiveOutMoney ELSE
CASE WHEN o.CommissionMoney <> -1 AND o.OrderState <> 3 THEN o.CommissionMoney ELSE 0 END END) AS CommissionMoney,
SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney
FROM RB_Order o left join rb_studyabroad c on o.SourceId = c.Id
LEFT JOIN (SELECT em.OrderId,SUM(em.GiveOutMoney) as GiveOutMoney FROM rb_sell_achievements_emp em GROUP BY em.OrderId) ea on ea.OrderId = o.OrderId
WHERE {where}
";
return Get<RB_Order_ViewModel>(sql).FirstOrDefault();
......@@ -1175,20 +1177,21 @@ ORDER BY {orderBy}
{
if (courseType == 1)
{
where += $" and c.CourseId in ({courseIds})";
where += $" and (o.CourseId in ({courseIds}) or o.OrderType =2)";
}
else
{
where += $" and c.CourseId not in ({courseIds})";
where += $" and o.CourseId not in ({courseIds})";
}
}
if (!string.IsNullOrEmpty(schoolIds))
{
where += $" and c.School_Id in ({schoolIds})";
where += $" and (c.School_Id in ({schoolIds}) or (s.School_Id in ({schoolIds}))) ";
}
string sql = $@"SELECT o.*,c.School_Id as ClassSchoolId FROM rb_order o
string sql = $@"SELECT o.*,IF(o.OrderType =1,c.School_Id,s.School_Id) as ClassSchoolId FROM rb_order o
left join rb_class c on o.ClassId = c.ClassId
left join rb_studyabroad s on o.SourceId = s.Id
left join rb_sell_achievements_emp e on o.OrderId = e.OrderId
WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.Income >0 and o.CreateTime >='{sDate}' and o.CreateTime <= '{eDate} 23:59:59'
and e.Id is null
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ bbd50152
......@@ -2100,10 +2100,13 @@ namespace Edu.WebApi.Controllers.Course
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
IsAchievements = x.YFCommission > 0 ? 1 : 2,
YFCommissionMoney = x.YFCommission > 0 ? x.YFCommission : GetOrderYFCommission(x),
x.CommissionMoney,
x.ExtraCommissionMoney,
x.ExtraRewardMoney,
x.ExtraDeductMoney,
x.IsCommissionGive,
IsCommissionGive = x.YFCommission > 0 ? 1 : x.IsCommissionGive,
CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
x.SaleRemark,
x.TeacherRemark,
......
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