页面修改

Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs

@@ -118,5 +118,6 @@ namespace Edu.Model.ViewModel.User
         /// 开班类型   1正常班   2滚动班
         /// </summary>
         public int ClassScrollType { get; set; }
+
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -1657,7 +1657,8 @@ namespace Edu.Module.Course
                 message = "应收总额不正确";
                 return flag;
             }
-            string LogContent = "";
+            string LogContent = "";//日志内容
+            string SaleRemark = "";//销售备注
             if (demodel.OrderId > 0)
             {
                 var orderModel = orderRepository.GetEntity(demodel.OrderId);
@@ -1712,22 +1713,14 @@ namespace Edu.Module.Course
                     if (orderModel.SaleRemark != demodel.SaleRemark)
                     {
                         LogContent += $"，销售备注由【{orderModel.SaleRemark}】修改为【{demodel.SaleRemark}】";
-                        order_RemarkRepository.Insert(new RB_Order_Remark()
-                        {
-                            Id = 0,
-                            Content = demodel.SaleRemark,
-                            CreateBy = demodel.CreateBy,
-                            CreateTime = DateTime.Now,
-                            OrderId = demodel.OrderId,
-                            Type = 1
-                        });
+                        SaleRemark = demodel.SaleRemark;
                     }
-                   
                 }
             }
             else
             {
                 LogContent = "新增留学就业订单";
+                SaleRemark= demodel.SaleRemark; 
                 if (studyModel.SaleState != Common.Enum.Sale.SaleStateEnum.Sell)
                 {
                     flag = false;
@@ -1735,25 +1728,79 @@ namespace Edu.Module.Course
                     return flag;
                 }
                 int OrderId = orderRepository.Insert(demodel);
+                demodel.OrderId = OrderId;
                 flag = OrderId > 0;
-                if (flag)
+              
+            }
+            //添加学员
+            if (!string.IsNullOrEmpty(demodel.StuIds))
+            {
+                //查询学生列表
+                var StuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = demodel.Group_Id, StuIds = demodel.StuIds, School_Id = -1 });
+                foreach (var item in StuList)
                 {
-                    //记录订单备注
-                    if (!string.IsNullOrEmpty(demodel.SaleRemark))
+                    var guestModel = new RB_Order_Guest_ViewModel()
                     {
-                        order_RemarkRepository.Insert(new RB_Order_Remark()
-                        {
-                            Id = 0,
-                            Content = demodel.SaleRemark,
-                            CreateBy = demodel.CreateBy,
-                            CreateTime = DateTime.Now,
-                            OrderId = OrderId,
-                            Type = 1
-                        });
-                    }
-                
+                        Id = 0,
+                        OrderId = demodel.OrderId,
+                        ClassId = 0,
+                        GuestName = item.StuName,
+                        GuestState = GuestStateEnum.Normal,
+                        Profession = item?.StuProfession ?? "",
+                        Sex = (item?.StuSex ?? 1) + 1,
+                        Age = item.StuBirth.HasValue ? DateTime.Now.Year - item.StuBirth.Value.Year : 18,
+                        Mobile = item?.StuTel ?? "",
+                        Basics = "",
+                        Education = item?.StuEducation ?? GuestEducationEnum.N2,
+                        GuestSource = demodel.OrderSource,
+                        LearningGoals = item?.StuPurpose ?? 0,
+                        Contact = item?.StuContract ?? "",
+                        ContactMobile = item?.StuContractMobile ?? "",
+                        Status = 0,
+                        Group_Id = demodel.Group_Id,
+                        School_Id = demodel.School_Id,
+                        CreateBy = demodel.CreateBy,
+                        CreateTime = demodel.CreateTime,
+                        UpdateBy = demodel.UpdateBy,
+                        UpdateTime = demodel.UpdateTime,
+                        DropOutRemark = "",
+                        IDCard = item?.StuIDCard ?? "",
+                        Domicile = item?.StuIDCardAddress ?? "",
+                        ContactAddress = item?.StuAddress ?? "",
+                        SourceId = demodel.SourceId,
+                        GraduatedSchool = "",
+                        GraduatedMajor = "",
+                        VolunteerMajor = "",
+                        Price = 0,
+                        StudyRemark = "",
+                        CompleteHours = 0,
+                        MakeUpHours = 0,
+                        StuIcon = item.StuIcon,
+                        TotalHours = 0,
+                        RenewState = 1,
+                        QQ = item.QQ,
+                        WeChatNo = item.WeChatNo,
+                        StudentId=item.StuId
+                    };
+                    SetOrderGuestInfo(guestModel, out string Nmessage);
                 }
             }
+
+            #region 添加销售备注 和日志
+            //记录订单备注
+            if (!string.IsNullOrEmpty(SaleRemark))
+            {
+                order_RemarkRepository.Insert(new RB_Order_Remark()
+                {
+                    Id = 0,
+                    Content = demodel.SaleRemark,
+                    CreateBy = demodel.CreateBy,
+                    CreateTime = DateTime.Now,
+                    OrderId = demodel.OrderId,
+                    Type = 1
+                });
+            }
+
             if (!string.IsNullOrEmpty(LogContent))
             {
                 changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
@@ -1768,7 +1815,9 @@ namespace Edu.Module.Course
                     SourceId = demodel.OrderId
                 });
             }
- 
+            #endregion
+
+            //flag = false;
             return flag;
         }
 

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -73,9 +73,9 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
             builder.AppendFormat(@" 
 SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
        ,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus,IFNULL(D.RenewState,0) AS RenewState
-FROM RB_Student_OrderGuest AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
-     INNER JOIN rb_order AS C  ON A.OrderId=C.OrderId
+FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C  ON A.OrderId=C.OrderId
 	 INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
+     LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
 WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -600,7 +600,7 @@ namespace Edu.WebApi.Controllers.Course
             demodel.School_Id = userInfo.School_Id;
             demodel.Dept_Id = userInfo.DeptId;
             demodel.OrderForm = OrderFormEnum.Computer;
-            if (demodel.OrderIdentify != 2)
+            if (demodel.OrderType== OrderTypeEnum.CourseOrder && demodel.OrderIdentify != 2)
             {
                 demodel.EnterID = userInfo.Id;  //由前端传递了， 可能会不存在 （此字段为市场人员）
             }

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -347,8 +347,8 @@ namespace Edu.WebApi.Controllers.Course
                                     UnitPriceTo = "",
                                     Number = 1,
                                     Rate = 1,
-                                    CostTypeId = financeConfig.CostTypeId,//配置信息
-                                    CurrencyId = financeConfig.CurrencyId,
+                                    financeConfig.CostTypeId,//配置信息
+                                    financeConfig.CurrencyId,
                                     Remark = itemDept.UserName + "的提成，学生数：" + itemDept.StudentCount + "，总提成：" + itemDept.CommissionMoeny,
                                     CostTypeName = "",//费用名称
                                     yTotalPrice = itemDept.CommissionMoeny,

Edu.WebApi/Controllers/Customer/CustomerStudentController.cs

@@ -402,7 +402,8 @@ namespace Edu.WebApi.Controllers.Customer
                     item.CompleteHours,
                     item.GuestName,
                     item.CourseName,
-                    item.ClassScrollType
+                    item.ClassScrollType,
+                    item.OrderType,
                 });
             }
             pageModel.Count = rowsCount;