Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/SellAchievementsModule.cs

@@ -841,6 +841,10 @@ namespace Edu.Module.Course
                         //    item.ClassScrollType = 2;
                         //}
 
+                        if (item.HelpEnterId <= 0) { item.HelpEnterId = stList2.Where(x => x.OrderId == item.OrderId).FirstOrDefault()?.AssistId ?? 0; }
+                        bool IsTYR = false;
+                        if (item.HelpEnterId == item.EnterID) { IsTYR = true; }
+
                         item.HelpEnterId = stList.Where(x => x.OrderId == item.OrderId).FirstOrDefault()?.AssistId ?? 0;
                         item.ClassScrollType = 2;//试听
 
@@ -853,6 +857,13 @@ namespace Edu.Module.Course
                                 item.HelpEnterId = stList2.Where(x => x.OrderId == item.OrderId).FirstOrDefault()?.AssistId ?? 0;
                             }
                         }
+
+                        if (IsTYR && item.ClassScrollType != 3) {
+                            item.ClassScrollType = 4;//老师独立成单  拿 5%
+                            if (item.HelpEnterId <= 0) {
+                                item.HelpEnterId = stList2.Where(x => x.OrderId == item.OrderId).FirstOrDefault()?.AssistId ?? 0;
+                            }
+                        }
                     }
                 }
                 if (orderList.Where(x => x.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder).Any()) {
@@ -886,6 +897,11 @@ namespace Edu.Module.Course
                                 TRate = Convert.ToDecimal(TeacherRuleList.Where(x => x.SNO == 4).FirstOrDefault()?.Content ?? "0");
                                 Remark = "教师续费订单提成：订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYJ;
                             }
+                            else if (qitem.ClassScrollType == 4) {
+                                //老师独立成单
+                                TRate = Convert.ToDecimal(TeacherRuleList.Where(x => x.SNO == 4).FirstOrDefault()?.Content ?? "0");
+                                Remark = "教师独立成交提成：订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYJ;
+                            }
                             else if (qitem.ClassScrollType == 3)
                             {
                                 //转介绍 
@@ -932,7 +948,7 @@ namespace Edu.Module.Course
                 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();
+                    var teaOrderList = orderList.Where(x => x.EnterID > 0 && ("," + item.EmpIds + ",").Contains("," + x.EnterID + ",") && ("," + item.SchoolIds + ",").Contains("," + x.ClassSchoolId + ",")).ToList();
                     if (!string.IsNullOrEmpty(item.CourseIds))
                     {
                         if (item.CourseType == 1)
@@ -1577,7 +1593,7 @@ namespace Edu.Module.Course
 
                         //订单应发提成 
                         decimal YFCommission = AchModel.PushMoney;
-                        if (YFCommission == 0 && SaleCommissioned == 0)
+                        if (YFCommission == 0 && SaleCommissioned == 0 && AchModel.PeopleNumMoney == 0)
                         {
                             continue;
                         }
@@ -1589,7 +1605,7 @@ namespace Edu.Module.Course
                         decimal TotalHours = g3list.Sum(x => x.TotalHours);// 直接根据学生表  总课时计算   (必须签到课时 = 总课时  才发完最后一个月的)
                         #endregion
 
-                        if (YFCommission == SaleCommissioned)
+                        if (YFCommission == SaleCommissioned && YFCommission > 0)
                         {
                             //正好提成已发放完成  直接更新 订单 已发放Ok
                             AchModel.GiveOutMoney = YFCommission;