页面修改

Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs

 using Edu.Common.Enum.Course;
+using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.Entity.Sell;
 using Edu.Model.ViewModel.Contract;
@@ -319,5 +320,15 @@ namespace Edu.Model.ViewModel.Sell
         /// 开班类型   1正常班   2滚动班
         /// </summary>
         public int ClassScrollType { get; set; }
+
+        /// <summary>
+        /// 客户来源见枚举(学生)
+        /// </summary>
+        public StuCreateTypeEnum CreateType { get; set; }
+
+        /// <summary>
+        /// 来源名称
+        /// </summary>
+        public string StuSourceIdName { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -364,5 +364,15 @@ namespace Edu.Model.ViewModel.User
         /// 查询时间类型(1-本周,2-上周,3-本月,4-上月)
         /// </summary>
         public int QTimeType { get; set; }
+
+        /// <summary>
+        ///查询订单编号【查询使用】
+        /// </summary>
+        public string QOrderIds { get; set; }
+
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public int OrderId { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/OrderModule.cs

 using Edu.AOP.CustomerAttribute;
 using Edu.Cache.User;
 using Edu.Common;
-using Edu.Common.API;
 using Edu.Common.Enum;
 using Edu.Common.Enum.Course;
 using Edu.Common.Enum.Sale;
@@ -10,7 +9,6 @@ using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.Contract;
-using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Sell;
 using Edu.Model.ViewModel.Contract;
 using Edu.Model.ViewModel.Course;
@@ -26,7 +24,6 @@ using Edu.Model.ViewModel.User;
 using Edu.Repository.Contract;
 using Edu.Repository.Course;
 using Edu.Repository.Customer;
-using Edu.Repository.EduTask;
 using Edu.Repository.Finance;
 using Edu.Repository.Grade;
 using Edu.Repository.Log;
@@ -3239,6 +3236,9 @@ namespace Edu.Module.Course
             if (orderList.Any())
             {
                 string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
+                //学员信息
+                List<RB_Student_ViewModel> stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { QOrderIds = orderIds },isQueryCreateType:true);
+               
                 List<int> idList = new List<int>();
                 List<RB_Order_ViewModel> sourceTargetList = new List<RB_Order_ViewModel>();
                 var sourceOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", orderList.Select(x => x.SourceOrderId)));
@@ -3326,6 +3326,10 @@ namespace Edu.Module.Course
                             subItem.ContractStatusStr = ContractStatusStr;
                         }
                     }
+
+                    var tempStu = stuList?.FirstOrDefault(qitem => qitem.OrderId == item.OrderId);
+                    item.CreateType = tempStu?.CreateType ?? StuCreateTypeEnum.EmployeeInput;
+                    item.StuSourceIdName = tempStu?.StuSourceIdName ?? "";
                 }
             }
             return orderList;

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -285,13 +285,13 @@ ORDER BY {orderBy}
 SELECT o.*,c.ClassName,c.ClassNo,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
        ,C.OpenTime,course.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName,IFNULL(school.SName,'') AS SchoolName
        ,IFNULL(c.ClassStatus,0) AS ClassStatus,IFNULL(course.CoverImg,'') AS CourseImg,IFNULL(course.B2BBackground,'') AS B2BBackground
-			 ,IFNULL(course.B2BIcon,'') AS B2BIcon,cu.CustomerName,cu.ContactNumber as CustomerTel,c.ClassScrollType
+	   ,IFNULL(course.B2BIcon,'') AS B2BIcon,cu.CustomerName,cu.ContactNumber as CustomerTel,c.ClassScrollType
 FROM RB_Order o  LEFT JOIN rb_class c on o.ClassId = c.ClassId
      LEFT JOIN rb_teacher t on c.Teacher_Id = t.TId
      LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1) 
      LEFT JOIN rb_course_subject AS csubject ON course.CourseSubject=csubject.Id
      LEFT JOIN rb_school AS school ON c.School_Id=school.SId
-     left join rb_customer cu on cu.CustomerId = o.CustomerId
+     LEFT JOIN rb_customer cu on cu.CustomerId = o.CustomerId
 WHERE {where} ORDER BY {orderBy}
 ";
             return GetPage<RB_Order_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();

Edu.WebApi/Controllers/B2BApp/B2BAppController.cs

@@ -108,6 +108,9 @@ namespace Edu.WebApi.Controllers.B2BApp
                     item.OrderId,
                     TotalHours=gModel?.TotalHours??0,
                     CompleteHours=gModel?.CompleteHours??0,
+                    item.CreateType,
+                    CreateTypeName= item.CreateType.ToName(),
+                    item.StuSourceIdName,
                 });
             }
             pageModel.PageData = result;

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1507,7 +1507,10 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractNo,
                         z.GuestId,
                         z.Status
-                    })
+                    }),
+                    x.CreateType,
+                    CreateTypeName = x.CreateType.ToName(),
+                    x.StuSourceIdName,
                 })
             };
             pageModel.PageData = obj;
@@ -1700,7 +1703,10 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractNo,
                         z.GuestId,
                         z.Status,
-                    })
+                    }),
+                    x.CreateType,
+                    CreateTypeName = x.CreateType.ToName(),
+                    x.StuSourceIdName,
                 })
             };
             pageModel.PageData = obj;