Skip to content

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

1 业绩提成调整

parent fe27f18f
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 35 deletions
Edu.Model/ViewModel/Sell/RB_Sell_Achievements_Emp_ViewModel.cs
View file @ 1070b457
...@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Sell ...@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Sell
/// 奖励数量 /// 奖励数量
/// </summary> /// </summary>
public int AwardOrderNum { get; set; } public int AwardOrderNum { get; set; }
/// <summary>
/// 当前订单金额
/// </summary>
public decimal OrderMoney { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/SellAchievementsModule.cs
View file @ 1070b457
...@@ -741,6 +741,12 @@ namespace Edu.Module.Course ...@@ -741,6 +741,12 @@ namespace Edu.Module.Course
//查询当月有效到访人数（邀约到访30分钟以上） //查询当月有效到访人数（邀约到访30分钟以上）
var stuList = studentRepository.GetValidVisitNum(Convert.ToDateTime(month + "-01").ToString("yyyy-MM-dd"), EDate, userInfo.Group_Id); var stuList = studentRepository.GetValidVisitNum(Convert.ToDateTime(month + "-01").ToString("yyyy-MM-dd"), EDate, userInfo.Group_Id);
#region 退费规则
//查询历史所有 退费的单子 汇总金额计入其当月的业绩计算 并回扣所有订单的提成(是 2023-10月这一期开始 回扣提成 ) PeriodId =64 开始扣提成
//首先查询 所有退费的单子
var ROrderList = sell_Achievements_EmpRepository.GetAllRefundWaitPendingList(userInfo.Group_Id);
#endregion
if (orderList.Any()) { if (orderList.Any()) {
//首先查询 根据规则 适配当月业绩 并生成对应的 订单人员业绩提成 //首先查询 根据规则 适配当月业绩 并生成对应的 订单人员业绩提成
foreach (var item in rulelist) { foreach (var item in rulelist) {
...@@ -1076,9 +1082,9 @@ namespace Edu.Module.Course ...@@ -1076,9 +1082,9 @@ namespace Edu.Module.Course
var orderChildList = consultantOrderList.Where(x => x.CourseConsultantId == ConsultantId).ToList(); var orderChildList = consultantOrderList.Where(x => x.CourseConsultantId == ConsultantId).ToList();
//计算市场业绩 //计算市场业绩
decimal TotalYj = orderChildList.Sum(x => x.PreferPrice - x.DiscountMoney); decimal TotalYj = orderChildList.Sum(x => x.PreferPrice - x.DiscountMoney);
//查询老师的提成 //历史退款
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && orderChildList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney); decimal refundMoney = ROrderList.Where(x => x.EmpId == ConsultantId).Sum(x => x.OrderMoney - x.OrderSaleMoney);
decimal YjMoney = TotalYj - teacherMoney;//排除老师的提成 decimal YjMoney = TotalYj + refundMoney;//排除老师的提成
if (item.SendType == 1) if (item.SendType == 1)
{ {
//根据业绩所在区间 查询比例 //根据业绩所在区间 查询比例
...@@ -1087,9 +1093,7 @@ namespace Edu.Module.Course ...@@ -1087,9 +1093,7 @@ namespace Edu.Module.Course
{ {
foreach (var qitem in orderChildList) foreach (var qitem in orderChildList)
{ {
//当前订单的业绩 //当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId).Sum(x => x.CommissionMoeny);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney; decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel() AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{ {
...@@ -1107,7 +1111,7 @@ namespace Edu.Module.Course ...@@ -1107,7 +1111,7 @@ namespace Edu.Module.Course
SaleMoney = YjMoney, SaleMoney = YjMoney,
OrderSaleMoney = orderYj, OrderSaleMoney = orderYj,
Type = 2, Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj Remark = "当月业绩：" + TotalYj + "，其中当月退款：" + refundMoney + "；订单业绩:" + orderYj
}); });
} }
} }
...@@ -1116,10 +1120,7 @@ namespace Edu.Module.Course ...@@ -1116,10 +1120,7 @@ namespace Edu.Module.Course
foreach (var qitem in orderChildList) foreach (var qitem in orderChildList)
{ {
//当前订单的业绩 //当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId).Sum(x => x.CommissionMoeny); decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
//int IsSureConsultTime = surList.Where(x => x.OrderId == qitem.OrderId).FirstOrDefault()?.OrderCount ?? 0;
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel() AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{ {
EmpId = qitem.CourseConsultantId, EmpId = qitem.CourseConsultantId,
...@@ -1136,7 +1137,7 @@ namespace Edu.Module.Course ...@@ -1136,7 +1137,7 @@ namespace Edu.Module.Course
SaleMoney = YjMoney, SaleMoney = YjMoney,
OrderSaleMoney = orderYj, OrderSaleMoney = orderYj,
Type = 2, Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj + "；根据人数发放提成：" + item.PeopleMoney + "/人" //+ (IsSureConsultTime == 1 ? "；满足邀约咨询30分钟以上奖励" + item.ExtraMoney : "") Remark = "当月业绩：" + TotalYj + "，其中当月退款：" + refundMoney + "；订单业绩:" + orderYj + "；根据人数发放提成：" + item.PeopleMoney + "/人" //+ (IsSureConsultTime == 1 ? "；满足邀约咨询30分钟以上奖励" + item.ExtraMoney : "")
}); });
} }
} }
...@@ -1167,9 +1168,8 @@ namespace Edu.Module.Course ...@@ -1167,9 +1168,8 @@ namespace Edu.Module.Course
{ {
//计算市场业绩 //计算市场业绩
decimal TotalYj = sellOrderList.Sum(x => x.PreferPrice - x.DiscountMoney); decimal TotalYj = sellOrderList.Sum(x => x.PreferPrice - x.DiscountMoney);
//查询老师的提成 decimal refundMoney = ROrderList.Where(x => EmpList.Contains(x.EmpId)).Sum(x => x.OrderMoney - x.OrderSaleMoney);
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && sellOrderList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney); decimal YjMoney = TotalYj + refundMoney;//排除 老师的提成
decimal YjMoney = TotalYj - teacherMoney;//排除 老师的提成
//根据业绩所在区间 查询比例 //根据业绩所在区间 查询比例
if (item.SendType == 1) if (item.SendType == 1)
{ {
...@@ -1179,8 +1179,6 @@ namespace Edu.Module.Course ...@@ -1179,8 +1179,6 @@ namespace Edu.Module.Course
foreach (var qitem in sellOrderList) foreach (var qitem in sellOrderList)
{ {
//当前订单的业绩 //当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId).Sum(x => x.CommissionMoeny);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney; decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
foreach (var emp in EmpList) foreach (var emp in EmpList)
{ {
...@@ -1200,7 +1198,7 @@ namespace Edu.Module.Course ...@@ -1200,7 +1198,7 @@ namespace Edu.Module.Course
SaleMoney = YjMoney, SaleMoney = YjMoney,
OrderSaleMoney = orderYj, OrderSaleMoney = orderYj,
Type = 1, Type = 1,
Remark = "当月业绩：" + TotalYj + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj Remark = "当月业绩：" + TotalYj + "，其中当月退款：" + refundMoney + "；订单业绩:" + orderYj
}); });
} }
} }
...@@ -1210,8 +1208,6 @@ namespace Edu.Module.Course ...@@ -1210,8 +1208,6 @@ namespace Edu.Module.Course
foreach (var qitem in sellOrderList) foreach (var qitem in sellOrderList)
{ {
//当前订单的业绩 //当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId).Sum(x => x.CommissionMoeny);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney; decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
//int IsSureConsultTime = surList.Where(x => x.OrderId == qitem.OrderId).FirstOrDefault()?.OrderCount ?? 0; //int IsSureConsultTime = surList.Where(x => x.OrderId == qitem.OrderId).FirstOrDefault()?.OrderCount ?? 0;
foreach (var emp in EmpList) foreach (var emp in EmpList)
...@@ -1232,7 +1228,7 @@ namespace Edu.Module.Course ...@@ -1232,7 +1228,7 @@ namespace Edu.Module.Course
SaleMoney = YjMoney, SaleMoney = YjMoney,
OrderSaleMoney = orderYj, OrderSaleMoney = orderYj,
Type = 1, Type = 1,
Remark = "当月业绩：" + TotalYj + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj + "；市场根据人数发放提成：" + item.PeopleMoney + "/人" //+ (IsSureConsultTime == 1 ? "；满足邀约咨询30分钟以上奖励" + item.ExtraMoney : "") Remark = "当月业绩：" + TotalYj + "，其中当月退款：" + refundMoney + "；订单业绩:" + orderYj + "；市场根据人数发放提成：" + item.PeopleMoney + "/人" //+ (IsSureConsultTime == 1 ? "；满足邀约咨询30分钟以上奖励" + item.ExtraMoney : "")
}); });
} }
} }
...@@ -1289,9 +1285,8 @@ namespace Edu.Module.Course ...@@ -1289,9 +1285,8 @@ namespace Edu.Module.Course
//课程顾问 //课程顾问
//计算市场业绩 //计算市场业绩
decimal TotalYj = consultantOrderList.Sum(x => x.PreferPrice - x.DiscountMoney); decimal TotalYj = consultantOrderList.Sum(x => x.PreferPrice - x.DiscountMoney);
//查询老师的提成 decimal refundMoney = ROrderList.Where(x => EmpList.Contains(x.EmpId)).Sum(x => x.OrderMoney - x.OrderSaleMoney);
decimal teacherMoney = AchEmpList.Where(x => x.Type == 3 && consultantOrderList.Select(y => y.OrderId).Contains(x.OrderId)).Sum(x => x.PushMoney); decimal YjMoney = TotalYj + refundMoney;//排除老师的提成
decimal YjMoney = TotalYj - teacherMoney;//排除老师的提成
if (item.SendType == 1) if (item.SendType == 1)
{ {
//根据业绩所在区间 查询比例 //根据业绩所在区间 查询比例
...@@ -1301,8 +1296,6 @@ namespace Edu.Module.Course ...@@ -1301,8 +1296,6 @@ namespace Edu.Module.Course
foreach (var qitem in consultantOrderList) foreach (var qitem in consultantOrderList)
{ {
//当前订单的业绩 //当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId).Sum(x => x.CommissionMoeny);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney; decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
foreach (var emp in EmpList) foreach (var emp in EmpList)
{ {
...@@ -1322,7 +1315,7 @@ namespace Edu.Module.Course ...@@ -1322,7 +1315,7 @@ namespace Edu.Module.Course
SaleMoney = YjMoney, SaleMoney = YjMoney,
OrderSaleMoney = orderYj, OrderSaleMoney = orderYj,
Type = 2, Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj Remark = "当月业绩：" + TotalYj + "，其中当月退款：" + refundMoney + "；订单业绩:" + orderYj
}); });
} }
} }
...@@ -1332,8 +1325,6 @@ namespace Edu.Module.Course ...@@ -1332,8 +1325,6 @@ namespace Edu.Module.Course
foreach (var qitem in consultantOrderList) foreach (var qitem in consultantOrderList)
{ {
//当前订单的业绩 //当前订单的业绩
decimal bdCommission = bdList.Where(x => x.OrderId == qitem.OrderId).Sum(x => x.CommissionMoeny);
decimal tCommission = AchEmpList.Where(x => x.Type == 3 && x.OrderId == qitem.OrderId).Sum(x => x.PushMoney);
decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney; decimal orderYj = qitem.PreferPrice - qitem.DiscountMoney;
//int IsSureConsultTime = surList.Where(x => x.OrderId == qitem.OrderId).FirstOrDefault()?.OrderCount ?? 0; //int IsSureConsultTime = surList.Where(x => x.OrderId == qitem.OrderId).FirstOrDefault()?.OrderCount ?? 0;
foreach (var emp in EmpList) foreach (var emp in EmpList)
...@@ -1354,7 +1345,7 @@ namespace Edu.Module.Course ...@@ -1354,7 +1345,7 @@ namespace Edu.Module.Course
SaleMoney = YjMoney, SaleMoney = YjMoney,
OrderSaleMoney = orderYj, OrderSaleMoney = orderYj,
Type = 2, Type = 2,
Remark = "当月业绩：" + TotalYj + "；当月老师提成：" + teacherMoney + "；订单b2b返佣：" + bdCommission + "；订单老师提成：" + tCommission + "；订单业绩:" + orderYj + "；根据人数发放提成：" + item.PeopleMoney + "/人" //+ (IsSureConsultTime == 1 ? "；满足邀约咨询30分钟以上奖励" + item.ExtraMoney : "") Remark = "当月业绩：" + TotalYj + "，其中当月退款：" + refundMoney + "；订单业绩:" + orderYj + "；根据人数发放提成：" + item.PeopleMoney + "/人" //+ (IsSureConsultTime == 1 ? "；满足邀约咨询30分钟以上奖励" + item.ExtraMoney : "")
}); });
} }
} }
...@@ -1365,6 +1356,33 @@ namespace Edu.Module.Course ...@@ -1365,6 +1356,33 @@ namespace Edu.Module.Course
} }
} }
#region 开始退款扣提成
if (ROrderList.Where(x => x.PeriodsId >= 64).Any())
{
foreach (var qitem in ROrderList.Where(x => x.PeriodsId >= 64))
{
AchEmpList.Add(new RB_Sell_Achievements_Emp_ViewModel()
{
Id = 0,
OrderId = qitem.OrderId,
Type = qitem.Type,
RuleId = qitem.RuleId,
EmpId = qitem.EmpId,
Rate = qitem.Rate,
Group_Id = qitem.Group_Id,
PushMoney = Math.Round((qitem.OrderMoney - qitem.OrderSaleMoney) * qitem.Rate / 100, 2, MidpointRounding.AwayFromZero),
GiveOutMoney = Math.Round((qitem.OrderMoney - qitem.OrderSaleMoney) * qitem.Rate / 100, 2, MidpointRounding.AwayFromZero),
GiveOutState = 1,
IsDept = qitem.IsDept,
PeriodsId = 0,
SaleMoney = 0,
Remark = "退款回扣提成，此单当期退款:" + (qitem.OrderMoney - qitem.OrderSaleMoney),
OrderSaleMoney = qitem.OrderMoney
});
}
}
#endregion
if (AchEmpList.Any()) { if (AchEmpList.Any()) {
//先插入 拿到ID //先插入 拿到ID
foreach (var item in AchEmpList) foreach (var item in AchEmpList)
...@@ -1390,7 +1408,7 @@ namespace Edu.Module.Course ...@@ -1390,7 +1408,7 @@ namespace Edu.Module.Course
#endregion #endregion
#region 基础数据 #region 基础数据
string orderIds = string.Join(",", AchEmpList.Select(x => x.OrderId).Distinct()); string orderIds = string.Join(",", AchEmpList.Where(x => !x.Remark.Contains("退款回扣")).Select(x => x.OrderId).Distinct());
orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = userInfo.Group_Id, QOrderIds = orderIds }); orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = userInfo.Group_Id, QOrderIds = orderIds });
//查询所有的人员 //查询所有的人员
var saleIdList = orderList.Where(x => x.EnterID > 0).Select(x => x.EnterID).Distinct().ToList(); var saleIdList = orderList.Where(x => x.EnterID > 0).Select(x => x.EnterID).Distinct().ToList();
...@@ -1404,6 +1422,10 @@ namespace Edu.Module.Course ...@@ -1404,6 +1422,10 @@ namespace Edu.Module.Course
{ {
saleIdList.AddRange(consultantIdList); saleIdList.AddRange(consultantIdList);
} }
if (AchEmpList.Where(x => x.Remark.Contains("退款回扣")).Any())
{
saleIdList.AddRange(AchEmpList.Where(x => x.Remark.Contains("退款回扣")).Select(x => x.EmpId));
}
var userIds = string.Join(",", saleIdList.Distinct()); var userIds = string.Join(",", saleIdList.Distinct());
var UserList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Group_Id = userInfo.Group_Id, QIds = userIds }); var UserList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Group_Id = userInfo.Group_Id, QIds = userIds });
//查询班级信息 //查询班级信息
...@@ -1633,6 +1655,27 @@ namespace Edu.Module.Course ...@@ -1633,6 +1655,27 @@ namespace Edu.Module.Course
} }
#endregion #endregion
#region 开始退款扣提成
if (ROrderList.Where(x => x.PeriodsId >= 64).Any()) {
foreach (var qitem in ROrderList.Where(x => x.PeriodsId >= 64)) {
//查询历史的
var detailModel = sell_Achievements_DetailsRepository.GetList(new RB_Sell_Achievements_Details_ViewModel() { Group_Id = qitem.Group_Id, RelatedId = qitem.Id }).LastOrDefault();
if (detailModel != null)
{
detailModel.Id = 0;
detailModel.PeriodId = 0;
detailModel.CommissionMoney = Math.Round((qitem.OrderMoney - qitem.OrderSaleMoney) * qitem.Rate / 100, 2, MidpointRounding.AwayFromZero);
detailModel.CurrentPeriodMoney = detailModel.CommissionMoney;
detailModel.IsFirstCommission = 1;
detailModel.GiveOutMoney = detailModel.CommissionMoney;
detailModel.RelatedId = AchEmpList.Where(x => x.Remark.Contains("退款回扣") && x.OrderId == qitem.OrderId && x.EmpId == qitem.EmpId && x.Type == qitem.Type).FirstOrDefault()?.Id ?? 0;
detailModel.FirstRate = 100;
CurrentList.Add(JsonHelper.DeserializeObject<RB_Sell_Achievements_Details_ViewModel>(JsonHelper.Serialize(detailModel)));
}
}
}
#endregion
#region 开始遍历 #region 开始遍历
List<RB_Sell_Achievements_Deduction_ViewModel> DeductionList = new List<RB_Sell_Achievements_Deduction_ViewModel>();//抵扣详情 List<RB_Sell_Achievements_Deduction_ViewModel> DeductionList = new List<RB_Sell_Achievements_Deduction_ViewModel>();//抵扣详情
var NorList = CurrentList.Where(x => x.IsDeduction != 1).ToList();//正常的 var NorList = CurrentList.Where(x => x.IsDeduction != 1).ToList();//正常的
...@@ -1763,10 +1806,10 @@ namespace Edu.Module.Course ...@@ -1763,10 +1806,10 @@ namespace Edu.Module.Course
#region 订单关联更新 #region 订单关联更新
//查询所有相关的提成明细 //查询所有相关的提成明细
string oIds = string.Join(",", AchEmpList.Where(x => x.OrderId > 0).Select(x => x.OrderId).Distinct()); string oIds = string.Join(",", AchEmpList.Where(x => x.OrderId > 0 && !x.Remark.Contains("退款回扣")).Select(x => x.OrderId).Distinct());
var adList = sell_Achievements_DetailsRepository.GetList(new RB_Sell_Achievements_Details_ViewModel() { Group_Id = userInfo.Group_Id, OrderIds = oIds }); var adList = sell_Achievements_DetailsRepository.GetList(new RB_Sell_Achievements_Details_ViewModel() { Group_Id = userInfo.Group_Id, OrderIds = oIds });
//再次查询 //再次查询
foreach (var item in AchEmpList.Where(x=>x.OrderId>0)) { foreach (var item in AchEmpList.Where(x=>x.OrderId>0 && !x.Remark.Contains("退款回扣"))) {
var TotalCommission = adList.Where(x => x.OrderId == item.OrderId && x.UserId == item.EmpId && x.UserType == item.Type && x.IsDept == item.IsDept).Sum(x => x.CurrentPeriodMoney); var TotalCommission = adList.Where(x => x.OrderId == item.OrderId && x.UserId == item.EmpId && x.UserType == item.Type && x.IsDept == item.IsDept).Sum(x => x.CurrentPeriodMoney);
item.GiveOutMoney = TotalCommission; item.GiveOutMoney = TotalCommission;
item.GiveOutState = 2; item.GiveOutState = 2;
...@@ -1789,7 +1832,7 @@ namespace Edu.Module.Course ...@@ -1789,7 +1832,7 @@ namespace Edu.Module.Course
}; };
sell_Achievements_EmpRepository.Update(keyValues, wheres); sell_Achievements_EmpRepository.Update(keyValues, wheres);
} }
foreach (var item in AchEmpList.Where(x => x.OrderId == -1)) { foreach (var item in AchEmpList.Where(x => x.OrderId == -1 || x.Remark.Contains("退款回扣"))) {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Sell_Achievements_Emp.GiveOutMoney), item.GiveOutMoney}, { nameof(RB_Sell_Achievements_Emp.GiveOutMoney), item.GiveOutMoney},
{ nameof(RB_Sell_Achievements_Emp.GiveOutState), item.GiveOutState}, { nameof(RB_Sell_Achievements_Emp.GiveOutState), item.GiveOutState},
...@@ -1816,6 +1859,24 @@ namespace Edu.Module.Course ...@@ -1816,6 +1859,24 @@ namespace Edu.Module.Course
return "出错了，请联系管理员"; return "出错了，请联系管理员";
} }
#endregion #endregion
#region 处理退款
foreach (var tiem in ROrderList) {
//修改为当前的收款
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Sell_Achievements_Emp.OrderSaleMoney), tiem.OrderMoney},
{ nameof(RB_Sell_Achievements_Emp.Remark), tiem.Remark +"；此单发生退款"+month+"，收款由"+tiem.OrderSaleMoney+"变更为"+tiem.OrderMoney},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof(RB_Sell_Achievements_Emp.Id),
FiledValue = tiem.Id,
OperatorEnum =OperatorEnum.Equal
}
};
sell_Achievements_EmpRepository.Update(keyValues, wheres);
}
#endregion
} }
return ""; return "";
......
Edu.Repository/Sell/RB_Sell_Achievements_DetailsRepository.cs
View file @ 1070b457
...@@ -65,7 +65,10 @@ namespace Edu.Repository.Sell ...@@ -65,7 +65,10 @@ namespace Edu.Repository.Sell
{ {
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}"; where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
} }
if (demodel.RelatedId > 0)
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.RelatedId)} ={demodel.RelatedId}";
}
string sql = $@" select r.* from RB_Sell_Achievements_Details r where {where} order by r.Id asc"; string sql = $@" select r.* from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
return Get<RB_Sell_Achievements_Details_ViewModel>(sql).ToList(); return Get<RB_Sell_Achievements_Details_ViewModel>(sql).ToList();
......
Edu.Repository/Sell/RB_Sell_Achievements_EmpRepository.cs
View file @ 1070b457
...@@ -179,5 +179,20 @@ WHERE e.Group_Id ={group_Id} and p.Periods in({string.Join(",", monthList)}) ...@@ -179,5 +179,20 @@ WHERE e.Group_Id ={group_Id} and p.Periods in({string.Join(",", monthList)})
GROUP BY e.Type,e.EmpId,e.Rate,e.IsDept,p.Periods"; GROUP BY e.Type,e.EmpId,e.Rate,e.IsDept,p.Periods";
return Get<RB_Sell_Achievements_Emp_ViewModel>(sql).ToList(); return Get<RB_Sell_Achievements_Emp_ViewModel>(sql).ToList();
} }
/// <summary>
/// 获取订单有退款的
/// </summary>
/// <param name="group_Id"></param>
/// <param name="eDate"></param>
/// <returns></returns>
public List<RB_Sell_Achievements_Emp_ViewModel> GetAllRefundWaitPendingList(int group_Id)
{
string sql = $@"SELECT e.*,(o.Income + o.PlatformTax -o.Refund) as OrderMoney FROM rb_sell_achievements_emp e
LEFT JOIN rb_order o on e.OrderId =o.OrderId
WHERE e.Group_Id={group_Id} and (e.Type=2 or (e.Type=1 and e.IsDept=1)) and e.OrderSaleMoney <> (o.Income + o.PlatformTax -o.Refund) and e.OrderId>0 and e.Remark not like '%退款回扣%'
ORDER BY e.OrderId ASC ";
return Get<RB_Sell_Achievements_Emp_ViewModel>(sql).ToList();
}
} }
} }
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