1

Edu.Module.Course/SellAchievementsModule.cs

@@ -765,9 +765,8 @@ namespace Edu.Module.Course
                     var TeacherRuleList = dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = userInfo.Group_Id, DictKey = "Teacher_Commission" });
                     if (TeacherRuleList.Any())
                     {
-                        string courseIds = string.Join(",", orderList.Where(x => x.HelpEnterId > 0).Select(x => x.CourseId).Distinct());
-                        var CourseList = courseRepository.GetCourseListRepository(new RB_Course_ViewModel() { Group_Id = userInfo.Group_Id, QCourseIds = courseIds });
-                        foreach (var qitem in orderList.Where(x => x.HelpEnterId > 0))
+                        string courseIds2 = string.Join(",", rulelist.Where(x => x.CourseType == 2 && !string.IsNullOrEmpty(x.CourseIds)).Select(x => x.CourseIds));
+                        foreach (var qitem in orderList.Where(x => x.HelpEnterId > 0 && !("," + courseIds2 + ",").Contains("," + x.CourseId + ",")))
                         {
                             decimal TRate = 0;
                             string Remark = "";
@@ -779,7 +778,8 @@ namespace Edu.Module.Course
                                 TRate = Convert.ToDecimal(TeacherRuleList.Where(x => x.SNO == 4).FirstOrDefault()?.Content ?? "0");
                                 Remark = "教师续费订单提成：订单b2b返佣：" + bdCommission + "；订单业绩:" + (qitem.PreferPrice - qitem.DiscountMoney - bdCommission);
                             }
-                            else {
+                            else
+                            {
                                 //新订单 
                                 TRate = Convert.ToDecimal(TeacherRuleList.Where(x => x.SNO == 1).FirstOrDefault()?.Content ?? "0");
                                 Remark = "教师试听订单提成：订单b2b返佣：" + bdCommission + "；订单业绩:" + (qitem.PreferPrice - qitem.DiscountMoney - bdCommission);