Skip to content

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

1

parent 7006ee43
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 26 deletions
Edu.Model/Entity/Sell/RB_Sell_Achievements_Periods.cs
View file @ f90464e3
...@@ -62,5 +62,9 @@ namespace Edu.Model.Entity.Sell ...@@ -62,5 +62,9 @@ namespace Edu.Model.Entity.Sell
/// </summary> /// </summary>
public string AdminRemark { get; set; } public string AdminRemark { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
} }
Edu.Module.Course/SellAchievementsModule.cs
View file @ f90464e3
...@@ -34,23 +34,6 @@ namespace Edu.Module.Course ...@@ -34,23 +34,6 @@ namespace Edu.Module.Course
/// </summary> /// </summary>
public class SellAchievementsModule public class SellAchievementsModule
{ {
/// <summary>
/// 销售提成规则
/// </summary>
private readonly RB_Sell_Commission_RuleRepository sell_Commission_RuleRepository = new RB_Sell_Commission_RuleRepository();
/// <summary>
/// 销售提成期数
/// </summary>
private readonly RB_Sell_Commission_PeriodsRepository sell_Commission_PeriodsRepository = new RB_Sell_Commission_PeriodsRepository();
/// <summary>
/// 销售提成明细
/// </summary>
private readonly RB_Sell_Commission_DetailsRepository sell_Commission_DetailsRepository = new RB_Sell_Commission_DetailsRepository();
/// <summary>
/// 销售提成抵扣
/// </summary>
private readonly RB_Sell_Commission_DeductionRepository sell_Commission_DeductionRepository = new RB_Sell_Commission_DeductionRepository();
/// <summary> /// <summary>
/// 时长顾问提成规则 /// 时长顾问提成规则
/// </summary> /// </summary>
...@@ -625,14 +608,14 @@ namespace Edu.Module.Course ...@@ -625,14 +608,14 @@ namespace Edu.Module.Course
EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]"); EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]");
} }
var list = GetSellAchievementsUserList(new RB_Sell_Achievements_Details_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = periodId }); var list = GetSellAchievementsUserList(new RB_Sell_Achievements_Details_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = periodId });
return ApiResult.Success("", list.Select(x => new return list.Select(x => new
{ {
x.UserId, x.UserId,
x.UserName, x.UserName,
x.StudentCount, x.StudentCount,
x.CurrentPeriodMoney, x.CurrentPeriodMoney,
IsGiveOut = EmpIdList.Contains(x.UserId) ? 1 : 2 IsGiveOut = EmpIdList.Contains(x.UserId) ? 1 : 2
})); });
} }
/// <summary> /// <summary>
...@@ -700,9 +683,9 @@ namespace Edu.Module.Course ...@@ -700,9 +683,9 @@ namespace Edu.Module.Course
string SchoolIds = string.Join(",", rulelist.Select(x => x.SchoolIds)); string SchoolIds = string.Join(",", rulelist.Select(x => x.SchoolIds));
//查询 班级订单 1.尾款收齐 //查询 班级订单 1.尾款收齐
string SDate = month + "-01"; string SDate = Config.NewAchievementsEnable;
string EDate = Convert.ToDateTime(month + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd"); string EDate = Convert.ToDateTime(month + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
var orderList = orderRepository.GetAllAchievementsSendOrderList(userInfo.Group_Id, EDate, 1, "", SchoolIds);//查询所有的 var orderList = orderRepository.GetAllAchievementsSendOrderList(userInfo.Group_Id, SDate, EDate, 1, "", SchoolIds);//查询所有的
List<RB_Sell_Achievements_Emp_ViewModel> AchEmpList = new List<RB_Sell_Achievements_Emp_ViewModel>();//需要新增当月的 List<RB_Sell_Achievements_Emp_ViewModel> AchEmpList = new List<RB_Sell_Achievements_Emp_ViewModel>();//需要新增当月的
if (orderList.Any()) { if (orderList.Any()) {
//首先查询 根据规则 适配当月业绩 并生成对应的 订单人员业绩提成 //首先查询 根据规则 适配当月业绩 并生成对应的 订单人员业绩提成
...@@ -1342,7 +1325,314 @@ namespace Edu.Module.Course ...@@ -1342,7 +1325,314 @@ namespace Edu.Module.Course
if (orderModel.CreateTime < EnableDate) { return false; } if (orderModel.CreateTime < EnableDate) { return false; }
//查询订单业绩关联 //查询订单业绩关联
var empList = sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { Group_Id = orderModel.Group_Id, OrderId = orderId }); var empList = sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { Group_Id = orderModel.Group_Id, OrderId = orderId });
if (empList.Any()) {
//查询业绩期数
int PeriodsId = empList.FirstOrDefault().PeriodsId;
var periodsModel = sell_Achievements_PeriodsRepository.GetEntity(PeriodsId);
if (periodsModel == null) { return false; }
var rulelist = JsonHelper.DeserializeObject<List<RB_Sell_Achievements_Rule_ViewModel>>(periodsModel.AdminRemark);
//查询关联的所有订单
var allList = sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { Group_Id = orderModel.Group_Id, PeriodsId = PeriodsId });
string orderIds = string.Join(",", allList.Select(x => x.OrderId).Distinct());
var orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = orderModel.Group_Id, QOrderIds = orderIds });
//重新计算
List<RB_Sell_Achievements_Emp_ViewModel> AchEmpList = new List<RB_Sell_Achievements_Emp_ViewModel>();//需要新增当月的
if (orderList.Any())
{
//首先查询 根据规则 适配当月业绩 并生成对应的 订单人员业绩提成
foreach (var item in rulelist)
{
//初始化规则比列
item.RateList = new List<AchievementsRateModel>();
if (!string.IsNullOrEmpty(item.Content))
{
item.RateList = JsonHelper.DeserializeObject<List<AchievementsRateModel>>(item.Content);
}
}
//根据订单 查询同行返佣
orderIds = string.Join(",", orderList.Select(x => x.OrderId));
var bdList = customer_BalanceDetailRepository.GetCustomerBalanceDetailListRepository(new Model.ViewModel.Customer.RB_Customer_BalanceDetail_ViewModel() { Group_Id = orderModel.Group_Id, QOrderIds = orderIds });
foreach (var item in rulelist.Where(x => x.Type == 3))
{
//老师适配规则
var teaOrderList = orderList.Where(x => x.HelpEnterId > 0 && ("," + item.EmpIds + ",").Contains("," + x.HelpEnterId + ",") && ("," + item.SchoolIds + ",").Contains("," + x.ClassSchoolId + ",")).ToList();
if (!string.IsNullOrEmpty(item.CourseIds))
{
if (item.CourseType == 1)
{
teaOrderList = teaOrderList.Where(x => ("," + item.CourseIds + ",").Contains("," + x.CourseId + ",")).ToList();
}
else
{
teaOrderList = teaOrderList.Where(x => !("," + item.CourseIds + ",").Contains("," + x.CourseId + ",")).ToList();
}
}
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)
{
foreach (var qitem in teaOrderList)
{
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.HelpEnterId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = orderModel.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(YjMoney * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
Type = 3,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney
});
}
}
}
}
foreach (var item in rulelist.Where(x => x.Type != 3))
{
if (string.IsNullOrEmpty(item.ChildEmpIds))
{
//非部门情况
//市场
if (item.Type == 1)
{
var sellOrderList = orderList.Where(x => x.EnterID > 0 && ("," + item.EmpIds + ",").Contains("," + x.EnterID + ",") && ("," + item.SchoolIds + ",").Contains("," + x.ClassSchoolId + ",")).ToList();
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)
{
foreach (var qitem in sellOrderList)
{
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.EnterID,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = orderModel.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(YjMoney * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
Type = 1,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney
});
}
}
}
}
//顾问
else
{
var consultantOrderList = orderList.Where(x => x.CourseConsultantId > 0 && ("," + item.EmpIds + ",").Contains("," + x.CourseConsultantId + ",") && ("," + item.SchoolIds + ",").Contains("," + x.ClassSchoolId + ",")).ToList();
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)
{
foreach (var qitem in consultantOrderList)
{
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = qitem.CourseConsultantId,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = orderModel.Group_Id,
Id = 0,
IsDept = 2,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(YjMoney * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney
});
}
}
}
}
}
else
{
//部门情况
//部门领取提成人
List<int> EmpList = JsonHelper.DeserializeObject<List<int>>("[" + item.EmpIds + "]");
if (item.Type == 1)
{
var sellOrderList = orderList.Where(x => x.EnterID > 0 && ("," + item.ChildEmpIds + ",").Contains("," + x.EnterID + ",") && ("," + item.SchoolIds + ",").Contains("," + x.ClassSchoolId + ",")).ToList();
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)
{
foreach (var qitem in sellOrderList)
{
foreach (var emp in EmpList)
{
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = emp,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = orderModel.Group_Id,
Id = 0,
IsDept = 1,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(YjMoney * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
Type = 1,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney
});
}
}
}
}
}
else
{
var consultantOrderList = orderList.Where(x => x.CourseConsultantId > 0 && ("," + item.ChildEmpIds + ",").Contains("," + x.CourseConsultantId + ",") && ("," + item.SchoolIds + ",").Contains("," + x.ClassSchoolId + ",")).ToList();
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)
{
foreach (var qitem in consultantOrderList)
{
foreach (var emp in EmpList)
{
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
EmpId = emp,
GiveOutMoney = 0,
GiveOutState = 2,
Group_Id = orderModel.Group_Id,
Id = 0,
IsDept = 1,
OrderId = qitem.OrderId,
PeriodsId = 0,
Rate = rateModel.Rate,
PushMoney = Math.Round(YjMoney * rateModel.Rate / 100, 2, MidpointRounding.AwayFromZero),
RuleId = item.Id,
SaleMoney = YjMoney,
Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月B2B返佣：" + bdMoney + "；当月老师提成：" + teacherMoney
});
}
}
}
}
}
}
}
}
//先验证是否掉档次了 没有掉档次的话 就当前订单处理 掉了就要整个处理
foreach (var item in empList) {
var emodel = AchEmpList.Where(x => x.OrderId == item.OrderId && x.EmpId == item.EmpId && x.Type == item.Type && x.IsDept == item.IsDept).FirstOrDefault();
if (emodel == null) { continue; }//没查到那就不管了
if (emodel.Rate != item.Rate)
{
//比例变更 相关订单都要重新跑
var upList = allList.Where(x => x.EmpId == item.EmpId && x.Type == item.Type && x.IsDept == item.IsDept).ToList();
foreach (var qitem in upList) {
var ecmodel = AchEmpList.Where(x => x.OrderId == qitem.OrderId && x.EmpId == qitem.EmpId && x.Type == qitem.Type && x.IsDept == qitem.IsDept).FirstOrDefault();
if (ecmodel == null) { continue; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Sell_Achievements_Emp_ViewModel.PushMoney), ecmodel.PushMoney},
{ nameof(RB_Sell_Achievements_Emp_ViewModel.Rate), ecmodel.Rate},
{ nameof(RB_Sell_Achievements_Emp_ViewModel.SaleMoney), ecmodel.SaleMoney},
{ nameof(RB_Sell_Achievements_Emp_ViewModel.Remark), qitem.Remark +"；订单"+orderId+"退款，导致当月业绩掉档，应发提成由'"+qitem.PushMoney+"'变成'"+ecmodel.PushMoney+"'；当月业绩由'"+qitem.SaleMoney+"'变成'"+ecmodel.SaleMoney+"'；提成比例由'"+qitem.Rate+"'变成'"+ecmodel.Rate+"'"},
{ nameof(RB_Sell_Achievements_Emp_ViewModel.GiveOutState), 2},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof(RB_Sell_Achievements_Emp_ViewModel.Id),
FiledValue = qitem.Id,
OperatorEnum =OperatorEnum.Equal
}
};
sell_Achievements_EmpRepository.Update(keyValues, wheres);
}
}
else {
//比例未变更 对当前订单修改
if (item.PushMoney != emodel.PushMoney) {
//需要更新应发提成
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Sell_Achievements_Emp_ViewModel.PushMoney), emodel.PushMoney},
{ nameof(RB_Sell_Achievements_Emp_ViewModel.Remark), item.Remark +"；订单"+orderId+"退款，应发提成由'"+item.PushMoney+"'变成'"+emodel.PushMoney+"'"},
{ nameof(RB_Sell_Achievements_Emp_ViewModel.GiveOutState), 2},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof(RB_Sell_Achievements_Emp_ViewModel.Id),
FiledValue = item.Id,
OperatorEnum =OperatorEnum.Equal
}
};
sell_Achievements_EmpRepository.Update(keyValues, wheres);
}
}
}
}
return true; return true;
} }
......
Edu.Module.Course/SellCommissionModule.cs
View file @ f90464e3
...@@ -462,7 +462,9 @@ namespace Edu.Module.Course ...@@ -462,7 +462,9 @@ namespace Edu.Module.Course
var courseList = courseRepository.GetCourseListRepository(new RB_Course_ViewModel() { Group_Id = userInfo.Group_Id, CourseName = "内部班" }); var courseList = courseRepository.GetCourseListRepository(new RB_Course_ViewModel() { Group_Id = userInfo.Group_Id, CourseName = "内部班" });
string courseIds = string.Join(",", courseList.Select(x => x.CourseId)); string courseIds = string.Join(",", courseList.Select(x => x.CourseId));
#endregion #endregion
var orderList = orderRepository.GetAllMoneyCollectedOrderList(userInfo.Group_Id, EDate, courseIds);//开班时间 必须在选择的月份之前 要排除内部班 --------------
string EnableDate = Config.NewAchievementsEnable;//新提成启用时间
var orderList = orderRepository.GetAllMoneyCollectedOrderList(userInfo.Group_Id, EDate, courseIds, EnableDate);//开班时间 必须在选择的月份之前 要排除内部班 --------------
if (orderList.Any()) if (orderList.Any())
{ {
#region 基础数据 #region 基础数据
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ f90464e3
...@@ -653,7 +653,7 @@ GROUP BY ClassId;"; ...@@ -653,7 +653,7 @@ GROUP BY ClassId;";
/// <param name="eDate">开班时间</param> /// <param name="eDate">开班时间</param>
/// <param name="courseIds">内部班课程</param> /// <param name="courseIds">内部班课程</param>
/// <returns></returns> /// <returns></returns>
public List<RB_Order_ViewModel> GetAllMoneyCollectedOrderList(int group_Id, string eDate,string courseIds) public List<RB_Order_ViewModel> GetAllMoneyCollectedOrderList(int group_Id, string eDate,string courseIds, string enableDate)
{ {
string where = ""; string where = "";
if (!string.IsNullOrEmpty(courseIds)) if (!string.IsNullOrEmpty(courseIds))
...@@ -662,7 +662,7 @@ GROUP BY ClassId;"; ...@@ -662,7 +662,7 @@ GROUP BY ClassId;";
} }
string sql = $@"SELECT o.* FROM rb_order o string sql = $@"SELECT o.* FROM rb_order o
inner join rb_class c on o.ClassId = c.ClassId inner join rb_class c on o.ClassId = c.ClassId
WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.EffectStatus in(1,2) and o.CommissionRate >0 and o.CreateTime <'2021-12-01' and c.OpenTime <= '{eDate} 23:59:59' {where} and o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) and (o.IsCommissionGiveOK =0 or (o.ExtraRewardMoney -o.ExtraDeductMoney)<> o.ExtraCommissionMoney);"; WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.EffectStatus in(1,2) and o.CommissionRate >0 and o.CreateTime <'{enableDate}' and c.OpenTime <= '{eDate} 23:59:59' {where} and o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) and (o.IsCommissionGiveOK =0 or (o.ExtraRewardMoney -o.ExtraDeductMoney)<> o.ExtraCommissionMoney);";
return Get<RB_Order_ViewModel>(sql).ToList(); return Get<RB_Order_ViewModel>(sql).ToList();
} }
...@@ -1145,7 +1145,7 @@ GROUP BY o.OrderId"; ...@@ -1145,7 +1145,7 @@ GROUP BY o.OrderId";
/// <param name="courseType">类型 1包含 2不包含</param> /// <param name="courseType">类型 1包含 2不包含</param>
/// <param name="courseIds"></param> /// <param name="courseIds"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Order_ViewModel> GetAllAchievementsSendOrderList(int group_Id, string eDate, int courseType, string courseIds, string schoolIds) public List<RB_Order_ViewModel> GetAllAchievementsSendOrderList(int group_Id, string sDate, string eDate, int courseType, string courseIds, string schoolIds)
{ {
string where = ""; string where = "";
if (!string.IsNullOrEmpty(courseIds)) if (!string.IsNullOrEmpty(courseIds))
...@@ -1167,7 +1167,7 @@ GROUP BY o.OrderId"; ...@@ -1167,7 +1167,7 @@ GROUP BY o.OrderId";
string sql = $@"SELECT o.*,c.School_Id as ClassSchoolId FROM rb_order o string sql = $@"SELECT o.*,c.School_Id as ClassSchoolId FROM rb_order o
left join rb_class c on o.ClassId = c.ClassId left join rb_class c on o.ClassId = c.ClassId
left join rb_sell_achievements_emp e on o.OrderId = e.OrderId left join rb_sell_achievements_emp e on o.OrderId = e.OrderId
WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.CreateTime >='2021-12-01' and o.CreateTime <= '{eDate} 23:59:59' WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.CreateTime >='{sDate}' and o.CreateTime <= '{eDate} 23:59:59'
and e.Id is null and e.Id is null
and o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) {where} and o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) {where}
group by o.OrderId group by o.OrderId
......
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