1

Edu.Module.Course/SellAchievementsModule.cs

@@ -511,6 +511,7 @@ 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);
+
             if (currentTHours >= TotalHours)
             {
                 //课已完成   发放剩余所有的提成
@@ -1012,8 +1013,6 @@ 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 = 20;
                         #endregion
 
                         if (YFCommission == SaleCommissioned)
@@ -1639,7 +1638,7 @@ namespace Edu.Module.Course
                                 { 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.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>() {
@@ -1658,7 +1657,7 @@ namespace Edu.Module.Course
                             //需要更新应发提成
                             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.Remark), item.Remark +"；（订单"+orderId+"退款，应发提成由'"+item.PushMoney+"'变成'"+emodel.PushMoney+"'）"},
                                 { nameof(RB_Sell_Achievements_Emp_ViewModel.GiveOutState), 2},
                             };
                             List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -1693,7 +1692,7 @@ namespace Edu.Module.Course
                 msg = "未查询到相关信息";
                 return "";
             }
-            return "业绩比例：" + empModel.Rate + "；业绩描述：" + empModel.Remark;
+            return "业绩比例：" + empModel.Rate + "%；业绩描述：" + empModel.Remark;
         }
         #endregion
     }

Edu.Repository/Sell/RB_Sell_Achievements_DetailsRepository.cs

@@ -115,7 +115,7 @@ namespace Edu.Repository.Sell
 
 
             string sql = $@" select r.*,
-(select count(0) from RB_Sell_Achievements_Details r1 where r1.UserId = r.UserId and r1.OrderId = r.OrderId and r1.Id <= r.Id) as IssueNum
+(select count(0) from RB_Sell_Achievements_Details r1 where r1.UserId = r.UserId and r1.OrderId = r.OrderId and r1.IsDept = r.IsDept and r1.Id <= r.Id) as IssueNum
 from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
             return Get<RB_Sell_Achievements_Details_ViewModel>(sql).ToList();
         }