1

Edu.Model/Entity/Sell/RB_Order.cs

@@ -375,5 +375,55 @@ namespace Edu.Model.Entity.Sell
         /// 课程顾问ID
         /// </summary>
         public int CourseConsultantId { get; set; }
+
+        /// <summary>
+        /// 直客首次报名优惠比例
+        /// </summary>
+        public decimal B2CRatio { get; set; }
+
+        /// <summary>
+        /// 直客续费优惠比例
+        /// </summary>
+        public decimal B2CReNewRatio { get; set; }
+
+        /// <summary>
+        /// 一般同行首次报名返佣比例
+        /// </summary>
+        public decimal B2BRebateRatio { get; set; }
+
+        /// <summary>
+        /// 一般同行续费返佣比例
+        /// </summary>
+        public decimal B2BReNewRatio { get; set; }
+
+        /// <summary>
+        /// 校代同行首次报名返佣比例
+        /// </summary>
+        public decimal SchoolRebateRatio { get; set; }
+
+        /// <summary>
+        /// 校代同行续费返佣比例
+        /// </summary>
+        public decimal SchoolReNewRatio { get; set; }
+
+        /// <summary>
+        /// 转介首次报名返佣比例
+        /// </summary>
+        public decimal TransIntroductceRatio { get; set; }
+
+        /// <summary>
+        /// 转介续费返佣比例
+        /// </summary>
+        public decimal TransIntroductceReNewRatio { get; set; }
+
+        /// <summary>
+        /// 內推首次报名返佣比例
+        /// </summary>
+        public decimal InnerRecommendRatio { get; set; }
+
+        /// <summary>
+        /// 內推续费返佣比例
+        /// </summary>
+        public decimal InnerRecommendReNewRatio { get; set; }
     }
 }

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

@@ -259,6 +259,16 @@ namespace Edu.Model.ViewModel.Grade
         /// 科目名称
         /// </summary>
         public string CourseSubjectName { get; set; }
+
+        /// <summary>
+        /// 直客首次报名优惠比例
+        /// </summary>
+        public decimal B2CRatio { get; set; }
+
+        /// <summary>
+        /// 直客续费优惠比例
+        /// </summary>
+        public decimal B2CReNewRatio { get; set; }
     }
 
     /// <summary>

Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs

@@ -23,6 +23,11 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public string ClassIds { get; set; }
 
+        /// <summary>
+        /// 学生Ids（我的客户报名）
+        /// </summary>
+        public string StuIds { get; set; }
+
         /// <summary>
         /// 课程课时
         /// </summary>

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -181,5 +181,10 @@ namespace Edu.Model.ViewModel.User
         /// 本周新增客户数量
         /// </summary>
         public int TodayCount { get; set; }
+
+        /// <summary>
+        /// 是否续费学生  1是
+        /// </summary>
+        public int IsRenewGuest { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Customer/CustomerModule.cs

@@ -343,5 +343,15 @@ namespace Edu.Module.Customer
             }
             return RList;
         }
+
+        /// <summary>
+        /// 获取我的同行列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Customer_Extend> GetMyCustomerList(RB_Customer_Extend query)
+        {
+            return customerRepository.GetCustomerListRepository(query);
+        }
     }
 }

Edu.Repository/Customer/RB_CustomerRepository.cs

@@ -128,6 +128,10 @@ WHERE 1=1
                         case 4: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerState), (int)CustomerStateEnum.Disable); break;
                     }
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CreateBy), query.CreateBy);
+                }
                 if (!string.IsNullOrEmpty(query.CustomerIds))
                 {
                     builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Customer_Extend.CustomerId), query.CustomerIds);

Edu.Repository/Grade/RB_ClassRepository.cs

@@ -335,7 +335,7 @@ WHERE A.ClassId={0}
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
-       ,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice 
+       ,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice ,B.B2CRatio,B.B2CReNewRatio
        ,B.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName
 FROM rb_class AS A  LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
      LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -743,6 +743,21 @@ WHERE  1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4  AND b.Or
         }
 
         #endregion
+        /// <summary>
+        /// 获取学生列表 根据手机号码
+        /// </summary>
+        /// <param name="mobileList"></param>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetGuestListForMobile(List<string> mobileList, int customerId, int groupId)
+        {
+            string sql = $@"SELECT g.Mobile FROM rb_order_guest g 
+LEFT JOIN rb_order o on g.OrderId = o.OrderId
+WHERE g.`Status` =0 and g.Group_Id ={groupId} and o.OrderState <>3 and o.OrderType =1 and o.CustomerId ={customerId} and g.Mobile in ({("'" + string.Join("','", mobileList) + "'")}) ";
+            
+            sql += " group by g.Mobile";
+            return Get<RB_Order_Guest_ViewModel>(sql).ToList();
+        }
 
     }
 }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -115,6 +115,8 @@ namespace Edu.WebApi.Controllers.Course
                     IsChaBan = IsInsertClass,
                     x.CourseSubject,
                     x.CourseSubjectName,
+                    x.B2CRatio,
+                    x.B2CReNewRatio
                 };
                 result.Add(obj);
             }
@@ -496,10 +498,12 @@ namespace Edu.WebApi.Controllers.Course
                 JoinType = OrderJoinTypeEnum.Normal,
                 TargetJoinType = OrderJoinTypeEnum.Normal,
                 DiscountMoney = base.ParmJObj.GetDecimal("DiscountMoney"),
-                PerDiscountMoney=base.ParmJObj.GetDecimal("PerDiscountMoney"),
+                PerDiscountMoney = base.ParmJObj.GetDecimal("PerDiscountMoney"),
                 IsLessPrice = base.ParmJObj.GetInt("IsLessPrice"),
                 LessPrice = base.ParmJObj.GetDecimal("LessPrice"),
-                PerLessMoney =base.ParmJObj.GetDecimal("PerLessMoney"),
+                PerLessMoney = base.ParmJObj.GetDecimal("PerLessMoney"),
+                CustomerId = base.ParmJObj.GetInt("CustomerId"),
+                StuIds = base.ParmJObj.GetStringValue("StuIds")
             };
             var IsInsertClass = base.ParmJObj.GetInt("IsChaBan");
             if (IsInsertClass == 1)
@@ -523,6 +527,13 @@ namespace Edu.WebApi.Controllers.Course
                 return ApiResult.ParamIsNull("请选择客人来源");
             }
 
+            if (!string.IsNullOrEmpty(demodel.StuIds)) {
+                int gNum = JsonHelper.DeserializeObject<List<int>>("[" + demodel.StuIds + "]").Count();
+                if (demodel.GuestNum != gNum) {
+                    return ApiResult.ParamIsNull("客人数量不正确");
+                }
+            }
+
             demodel.Group_Id = userInfo.Group_Id;
             demodel.School_Id = userInfo.School_Id;
             demodel.Dept_Id = userInfo.DeptId;

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -549,6 +549,33 @@ namespace Edu.WebApi.Controllers.Customer
             return ApiResult.Success("", Robj);
         }
 
+        /// <summary>
+        /// 获取我的同行列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMyCustomerList() {
+            var query = new RB_Customer_Extend()
+            {
+                Group_Id = base.UserInfo.Group_Id,
+                CreateBy = base.UserInfo.Id,
+                CustomerId = base.ParmJObj.GetInt("CustomerId"),
+                CustomerName = base.ParmJObj.GetStringValue("CustomerName"),
+                ContactNumber = base.ParmJObj.GetStringValue("ContactNumber"),
+                ApproveState = 1,
+                QCustomerState = 1,
+            };
+            var list = customerModule.GetMyCustomerList(query);
+            return ApiResult.Success(data: list.Select(x => new
+            {
+                x.CustomerId,
+                x.CustomerName,
+                x.ContactNumber,
+                x.EnterpriseName,
+                x.CustomerType
+            }));
+        }
+
         #endregion
     }
 }