Skip to content

E
Education
Commit 5cc039c0 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 8bf6f35b
Show whitespace changes
Inline Side-by-side
Showing with 258 additions and 99 deletions
Edu.Model/Entity/Sell/RB_Order.cs
View file @ 5cc039c0
...@@ -375,5 +375,55 @@ namespace Edu.Model.Entity.Sell ...@@ -375,5 +375,55 @@ namespace Edu.Model.Entity.Sell
/// 课程顾问ID /// 课程顾问ID
/// </summary> /// </summary>
public int CourseConsultantId { get; set; } 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
View file @ 5cc039c0
...@@ -259,6 +259,16 @@ namespace Edu.Model.ViewModel.Grade ...@@ -259,6 +259,16 @@ namespace Edu.Model.ViewModel.Grade
/// 科目名称 /// 科目名称
/// </summary> /// </summary>
public string CourseSubjectName { get; set; } public string CourseSubjectName { get; set; }
/// <summary>
/// 直客首次报名优惠比例
/// </summary>
public decimal B2CRatio { get; set; }
/// <summary>
/// 直客续费优惠比例
/// </summary>
public decimal B2CReNewRatio { get; set; }
} }
/// <summary> /// <summary>
......
Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs
View file @ 5cc039c0
...@@ -23,6 +23,11 @@ namespace Edu.Model.ViewModel.Sell ...@@ -23,6 +23,11 @@ namespace Edu.Model.ViewModel.Sell
/// </summary> /// </summary>
public string ClassIds { get; set; } public string ClassIds { get; set; }
/// <summary>
/// 学生Ids（我的客户报名）
/// </summary>
public string StuIds { get; set; }
/// <summary> /// <summary>
/// 课程课时 /// 课程课时
/// </summary> /// </summary>
......
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ 5cc039c0
...@@ -181,5 +181,10 @@ namespace Edu.Model.ViewModel.User ...@@ -181,5 +181,10 @@ namespace Edu.Model.ViewModel.User
/// 本周新增客户数量 /// 本周新增客户数量
/// </summary> /// </summary>
public int TodayCount { get; set; } public int TodayCount { get; set; }
/// <summary>
/// 是否续费学生 1是
/// </summary>
public int IsRenewGuest { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/OrderModule.cs
View file @ 5cc039c0
...@@ -396,83 +396,75 @@ namespace Edu.Module.Course ...@@ -396,83 +396,75 @@ namespace Edu.Module.Course
//课程信息 //课程信息
var courseModel = courseRepository.GetEntity(demodel.CourseId); var courseModel = courseRepository.GetEntity(demodel.CourseId);
decimal coursePrice = courseModel.SellPrice;//课程最低单价 decimal coursePrice = courseModel.SellPrice;//课程最低单价
#region 课程比例赋值
demodel.B2CRatio = courseModel.B2CRatio;
demodel.B2CReNewRatio = courseModel.B2CReNewRatio;
demodel.B2BRebateRatio = courseModel.B2BRebateRatio;
demodel.B2BReNewRatio = courseModel.B2BReNewRatio;
demodel.SchoolRebateRatio = courseModel.SchoolRebateRatio;
demodel.SchoolReNewRatio = courseModel.SchoolReNewRatio;
demodel.TransIntroductceRatio = courseModel.TransIntroductceRatio;
demodel.TransIntroductceReNewRatio = courseModel.TransIntroductceReNewRatio;
demodel.InnerRecommendRatio = courseModel.InnerRecommendRatio;
demodel.InnerRecommendReNewRatio = courseModel.InnerRecommendReNewRatio;
#endregion
#region 计算订单优惠信息 #region 计算订单优惠信息
//获取课程优惠 List<RB_Student_ViewModel> StuList = new List<RB_Student_ViewModel>();
var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
{
CourseId = demodel.CourseId
});
//计算续费订单优惠 //计算续费订单优惠
if (demodel.JoinType == OrderJoinTypeEnum.RenewOrder && demodel.OrderId == 0) if (demodel.JoinType == OrderJoinTypeEnum.RenewOrder && demodel.OrderId == 0)
{ {
var renewOrderDiscount = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.Renewal)?.FirstOrDefault(); demodel.DiscountMoney = coursePrice * (courseModel.B2CReNewRatio / 100);
if (renewOrderDiscount != null) demodel.SaleRemark = "续费报名优惠" + courseModel.B2CReNewRatio + "%";
{
if ((renewOrderDiscount?.PriceType ?? 0) == 0)
{
demodel.DiscountMoney = coursePrice - coursePrice * (100 - (renewOrderDiscount?.PriceMoney ?? 0)) / 100;
demodel.SaleRemark = "续费报名优惠" + renewOrderDiscount.PriceMoney + "%";
} }
else else if ((demodel.JoinType == OrderJoinTypeEnum.Normal || demodel.JoinType == OrderJoinTypeEnum.InsertClass) && string.IsNullOrEmpty(demodel.StuIds))
{ {
demodel.DiscountMoney = (coursePrice - (renewOrderDiscount?.PriceMoney ?? 0)) * demodel.GuestNum; //默认都是首次报名优惠
demodel.SaleRemark = "续费报名优惠" + renewOrderDiscount.PriceMoney + "元"; decimal DiscountMoney = coursePrice * (courseModel.B2CRatio / 100);
} if (demodel.DiscountMoney != DiscountMoney * demodel.GuestNum) {
demodel.PerDiscountMoney = demodel.DiscountMoney / demodel.GuestNum; message = "优惠金额不正确";
return false;
} }
} }
decimal disMoney = 0;//课程最大优惠金额 else if (!string.IsNullOrEmpty(demodel.StuIds))
decimal lessMoney = 0;//课程最大少价金额
var coursePreferentialModel = new RB_Course_Preferential_Extend();
if (coursePreferentialList != null && coursePreferentialList.Count > 0)
{ {
if (demodel.GuestNum == 1) //查询学生列表
{ StuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = demodel.Group_Id, StuIds = demodel.StuIds });
coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault(); //根据客人手机号码 验证是否是续费
if (StuList.Select(x => x.CustomerId).Distinct().Count() > 1) {
message = "只能选择同一同行的客户报名";
return false;
} }
if (demodel.GuestNum >= 2) if (StuList.Count() != demodel.GuestNum) {
{ message = "学生信息有误";
coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault(); return false;
} }
var saleCommissionType = coursePreferentialModel?.SaleCommissionType ?? 0; var glist = order_GuestRepository.GetGuestListForMobile(StuList.Select(x => x.StuTel).ToList(), demodel.CustomerId, demodel.Group_Id);
if (saleCommissionType == 0) if (glist.Any()) {
{ foreach (var item in StuList) {
var tempMoney = (courseModel?.SellPrice ?? 0) * (coursePreferentialModel?.SaleCommissionMoney ?? 0); if (glist.Where(x => x.Mobile == item.StuTel).Any()) {
lessMoney = tempMoney / Convert.ToDecimal(100); item.IsRenewGuest = 1;//是续费的
} }
else
{
lessMoney = coursePreferentialModel?.SaleCommissionMoney ?? 0;
} }
var b2bCommissionType = coursePreferentialModel?.B2BCommissionType ?? 0;
if (b2bCommissionType == 0)
{
var tempMoney = (courseModel?.SellPrice ?? 0) * (coursePreferentialModel?.B2BCommissionMoney ?? 0);
lessMoney += tempMoney / Convert.ToDecimal(100);
} }
else int RenewNum = glist.Select(x => x.Mobile).Distinct().Count();//续费订单数量
int NormalNum = demodel.GuestNum - RenewNum;//首次报名数量
decimal dmoney = coursePrice * (courseModel.B2CRatio / 100) * NormalNum + coursePrice * (courseModel.B2CReNewRatio / 100) * RenewNum;
if (demodel.DiscountMoney != dmoney)
{ {
lessMoney = coursePreferentialModel?.B2BCommissionMoney ?? 0; message = "优惠金额不正确";
return false;
}
} }
//获取课程优惠
var priceCommissionType = coursePreferentialModel?.PriceType ?? 0; var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
if (priceCommissionType == 0)
{ {
disMoney = (100 - (coursePreferentialModel?.PriceMoney ?? 0)) / 100; CourseId = demodel.CourseId
coursePrice = coursePrice * (100 - (coursePreferentialModel?.PriceMoney ?? 0)) / 100; });
} if (coursePreferentialList != null && coursePreferentialList.Count > 0)
else
{ {
disMoney = coursePreferentialModel?.PriceMoney ?? 0;
coursePrice -= (coursePreferentialModel?.PriceMoney ?? 0);
}
#region 记录提成信息 #region 记录提成信息
if (coursePreferentialModel == null) var coursePreferentialModel = coursePreferentialList.FirstOrDefault();
{
coursePreferentialModel = coursePreferentialList.FirstOrDefault();
}
demodel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0; demodel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
demodel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0; demodel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0;
demodel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0; demodel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0;
...@@ -483,22 +475,6 @@ namespace Edu.Module.Course ...@@ -483,22 +475,6 @@ namespace Edu.Module.Course
} }
#endregion #endregion
} }
if (demodel.IsLessPrice == 1 && demodel.LessPrice > 0)
{
if (coursePreferentialList != null && coursePreferentialList.Count > 0)
{
if (demodel.LessPrice > lessMoney)
{
message = string.Format("优惠金额不能大于{0}", disMoney.ToString("0.00"));
return flag;
}
}
else
{
message = "此课程未配置【销售提成】信息，请通知OP在课程里面添加优惠信息!";
return flag;
}
}
#endregion #endregion
if (demodel.OrderSource == OrderSourceEnum.EduClient || demodel.OrderSource == OrderSourceEnum.Client) if (demodel.OrderSource == OrderSourceEnum.EduClient || demodel.OrderSource == OrderSourceEnum.Client)
{ {
...@@ -516,11 +492,6 @@ namespace Edu.Module.Course ...@@ -516,11 +492,6 @@ namespace Edu.Module.Course
demodel.EduOccupation = ""; demodel.EduOccupation = "";
demodel.GeneralOccupation = ""; demodel.GeneralOccupation = "";
} }
if (demodel.IsLessPrice == 0)
{
demodel.LessPrice = 0;
demodel.PerLessMoney = 0;
}
var orderModel = new RB_Order(); var orderModel = new RB_Order();
if (demodel.OrderId > 0) if (demodel.OrderId > 0)
{ {
...@@ -549,16 +520,16 @@ namespace Edu.Module.Course ...@@ -549,16 +520,16 @@ namespace Edu.Module.Course
//没有总经理修改订单权限 //没有总经理修改订单权限
if (!isEditOrder) if (!isEditOrder)
{ {
if (demodel.Unit_Price < coursePrice) //if (demodel.Unit_Price < coursePrice)
{ //{
flag = false; // flag = false;
message = "成交单价不能小于最低价格"; // message = "成交单价不能小于最低价格";
return flag; // return flag;
} //}
if (demodel.JoinType == OrderJoinTypeEnum.InsertClass) if (demodel.JoinType == OrderJoinTypeEnum.InsertClass)
{ {
var newPreferPrice = Math.Round(coursePrice / courseModel.ClassHours * (courseModel.ClassHours - demodel.StartClassHours) * demodel.GuestNum, 2); var newPreferPrice = Math.Round(coursePrice / courseModel.ClassHours * (courseModel.ClassHours - demodel.StartClassHours) * demodel.GuestNum, 2);
if (demodel.PreferPrice != (newPreferPrice - demodel.LessPrice)) if (demodel.PreferPrice != (newPreferPrice - demodel.DiscountMoney))
{ {
flag = false; flag = false;
message = "应收总额不正确"; message = "应收总额不正确";
...@@ -571,7 +542,7 @@ namespace Edu.Module.Course ...@@ -571,7 +542,7 @@ namespace Edu.Module.Course
} }
else else
{ {
if (demodel.PreferPrice != (demodel.Unit_Price * demodel.GuestNum - demodel.LessPrice)) if (demodel.PreferPrice != (coursePrice * demodel.GuestNum - demodel.DiscountMoney))
{ {
flag = false; flag = false;
message = "应收总额不正确"; message = "应收总额不正确";
...@@ -624,6 +595,10 @@ namespace Edu.Module.Course ...@@ -624,6 +595,10 @@ namespace Edu.Module.Course
#region 验证学生名单数量 #region 验证学生名单数量
var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = GuestStateEnum.Normal }); var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = GuestStateEnum.Normal });
if (glist.Any() && orderModel.CustomerId != demodel.CustomerId) {
message = "订单已创建学生名单，无法修改其同行";
return false;
}
if (glist.Count() > demodel.GuestNum) if (glist.Count() > demodel.GuestNum)
{ {
flag = false; flag = false;
...@@ -797,7 +772,7 @@ namespace Edu.Module.Course ...@@ -797,7 +772,7 @@ namespace Edu.Module.Course
TotalHours = Convert.ToInt32(courseModel.ClassHours), TotalHours = Convert.ToInt32(courseModel.ClassHours),
CompleteHours = 0, CompleteHours = 0,
MakeUpHours = 0, MakeUpHours = 0,
StuIcon = "", StuIcon = ""
}; };
SetOrderGuestInfo(guestModel, out string Nmessage); SetOrderGuestInfo(guestModel, out string Nmessage);
} }
...@@ -843,7 +818,7 @@ namespace Edu.Module.Course ...@@ -843,7 +818,7 @@ namespace Edu.Module.Course
StudyRemark = "", StudyRemark = "",
CompleteHours = 0, CompleteHours = 0,
MakeUpHours = 0, MakeUpHours = 0,
StuIcon = "", StuIcon = ""
}; };
if (demodel.RenewOrderId > 0) if (demodel.RenewOrderId > 0)
{ {
...@@ -864,7 +839,53 @@ namespace Edu.Module.Course ...@@ -864,7 +839,53 @@ namespace Edu.Module.Course
} }
#endregion #endregion
#region 插入学生名单(客户选择转订单)
if (flag && !string.IsNullOrEmpty(demodel.StuIds)) {
foreach (var item in StuList) {
var guestModel = new RB_Order_Guest_ViewModel()
{
Id = 0,
OrderId = demodel.OrderId,
ClassId = demodel.ClassId,
GuestName = item.StuName,
GuestState = GuestStateEnum.Normal,
Profession = item?.StuProfession ?? "",
Sex = item?.StuSex ?? 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 ?? GuestLearningGoalsEnum.Love,
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 = 0,
GraduatedSchool = "",
GraduatedMajor = "",
VolunteerMajor = "",
Price = 0,
StudyRemark = "",
CompleteHours = 0,
MakeUpHours = 0,
StuIcon = item.StuIcon,
TotalHours = Convert.ToInt32(courseModel.ClassHours),
RenewState = item.IsRenewGuest == 1 ? 2 : 1
};
SetOrderGuestInfo(guestModel, out string Nmessage);
}
}
#endregion
#region 更新甲鹤小程序规格对应的库存 #region 更新甲鹤小程序规格对应的库存
if (flag && demodel.JoinType != OrderJoinTypeEnum.RenewOrder)//续费订单不去更新规格库存 if (flag && demodel.JoinType != OrderJoinTypeEnum.RenewOrder)//续费订单不去更新规格库存
...@@ -2167,6 +2188,7 @@ namespace Edu.Module.Course ...@@ -2167,6 +2188,7 @@ namespace Edu.Module.Course
StuTel = dmodel.Mobile, StuTel = dmodel.Mobile,
UpdateBy = dmodel.CreateBy, UpdateBy = dmodel.CreateBy,
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
CustomerId = ordermodel.CustomerId
}; };
studentRepository.SetStudentRepository(stuModel); studentRepository.SetStudentRepository(stuModel);
......
Edu.Module.Customer/CustomerModule.cs
View file @ 5cc039c0
...@@ -343,5 +343,15 @@ namespace Edu.Module.Customer ...@@ -343,5 +343,15 @@ namespace Edu.Module.Customer
} }
return RList; 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
View file @ 5cc039c0
...@@ -128,6 +128,10 @@ WHERE 1=1 ...@@ -128,6 +128,10 @@ WHERE 1=1
case 4: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerState), (int)CustomerStateEnum.Disable); break; 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)) if (!string.IsNullOrEmpty(query.CustomerIds))
{ {
builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Customer_Extend.CustomerId), query.CustomerIds); builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Customer_Extend.CustomerId), query.CustomerIds);
......
Edu.Repository/Grade/RB_ClassRepository.cs
View file @ 5cc039c0
...@@ -335,7 +335,7 @@ WHERE A.ClassId={0} ...@@ -335,7 +335,7 @@ WHERE A.ClassId={0}
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName 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 ,B.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId 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 LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
......
Edu.Repository/Sell/RB_Order_GuestRepository.cs
View file @ 5cc039c0
...@@ -743,6 +743,21 @@ WHERE 1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4 AND b.Or ...@@ -743,6 +743,21 @@ WHERE 1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4 AND b.Or
} }
#endregion #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
View file @ 5cc039c0
...@@ -115,6 +115,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -115,6 +115,8 @@ namespace Edu.WebApi.Controllers.Course
IsChaBan = IsInsertClass, IsChaBan = IsInsertClass,
x.CourseSubject, x.CourseSubject,
x.CourseSubjectName, x.CourseSubjectName,
x.B2CRatio,
x.B2CReNewRatio
}; };
result.Add(obj); result.Add(obj);
} }
...@@ -496,10 +498,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -496,10 +498,12 @@ namespace Edu.WebApi.Controllers.Course
JoinType = OrderJoinTypeEnum.Normal, JoinType = OrderJoinTypeEnum.Normal,
TargetJoinType = OrderJoinTypeEnum.Normal, TargetJoinType = OrderJoinTypeEnum.Normal,
DiscountMoney = base.ParmJObj.GetDecimal("DiscountMoney"), DiscountMoney = base.ParmJObj.GetDecimal("DiscountMoney"),
PerDiscountMoney=base.ParmJObj.GetDecimal("PerDiscountMoney"), PerDiscountMoney = base.ParmJObj.GetDecimal("PerDiscountMoney"),
IsLessPrice = base.ParmJObj.GetInt("IsLessPrice"), IsLessPrice = base.ParmJObj.GetInt("IsLessPrice"),
LessPrice = base.ParmJObj.GetDecimal("LessPrice"), 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"); var IsInsertClass = base.ParmJObj.GetInt("IsChaBan");
if (IsInsertClass == 1) if (IsInsertClass == 1)
...@@ -523,6 +527,13 @@ namespace Edu.WebApi.Controllers.Course ...@@ -523,6 +527,13 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.ParamIsNull("请选择客人来源"); 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.Group_Id = userInfo.Group_Id;
demodel.School_Id = userInfo.School_Id; demodel.School_Id = userInfo.School_Id;
demodel.Dept_Id = userInfo.DeptId; demodel.Dept_Id = userInfo.DeptId;
......
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @ 5cc039c0
...@@ -549,6 +549,33 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -549,6 +549,33 @@ namespace Edu.WebApi.Controllers.Customer
return ApiResult.Success("", Robj); 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 #endregion
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment