Skip to content

E
Education
Commit 620f29c7 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent e199fe1b
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 8 deletions
Edu.Common/Enum/Course/CourseRebateSetEnum.cs 0 → 100644
View file @ 620f29c7
using Edu.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Common.Enum.Course
{
/// <summary>
/// 课程返佣设置
/// </summary>
public enum CourseRebateSetEnum
{
/// <summary>
/// 课耗提成
/// </summary>
[EnumField("课耗提成")]
CourseConsume = 1,
/// <summary>
/// 次月全提
/// </summary>
[EnumField("次月全提")]
NextMonth = 2,
/// <summary>
/// 课时比例
/// </summary>
[EnumField("课时比例")]
CourseProportion = 3,
}
}
Edu.Model/Entity/Course/RB_Course.cs
View file @ 620f29c7
......@@ -177,41 +177,121 @@ namespace Edu.Model.Entity.Course
/// </summary>
public decimal B2BRebateRatio { get; set; }
/// <summary>
/// 一般同行首次报名返佣类型
/// </summary>
public CourseRebateSetEnum B2BRebateRatioType { get; set; }
/// <summary>
/// 一般同行首次报名返佣课程比例值
/// </summary>
public decimal B2BRebateRatioValue { get; set; }
/// <summary>
/// 一般同行续费返佣比例
/// </summary>
public decimal B2BReNewRatio { get; set; }
/// <summary>
/// 一般同行续费返佣类型
/// </summary>
public CourseRebateSetEnum B2BReNewRatioType { get; set; }
/// <summary>
/// 一般同行续费返佣课程比例值
/// </summary>
public decimal B2BReNewRatioValue { get; set; }
/// <summary>
/// 校代同行首次报名返佣比例
/// </summary>
public decimal SchoolRebateRatio { get; set; }
/// <summary>
/// 校代同行首次返佣类型
/// </summary>
public CourseRebateSetEnum SchoolRebateRatioType { get; set; }
/// <summary>
/// 校代同行首次返佣课程比例值
/// </summary>
public decimal SchoolRebateRatioValue { get; set; }
/// <summary>
/// 校代同行续费返佣比例
/// </summary>
public decimal SchoolReNewRatio { get; set; }
/// <summary>
/// 校代同行续费返佣类型
/// </summary>
public CourseRebateSetEnum SchoolReNewRatioType { get; set; }
/// <summary>
/// 校代同行续费返佣课程比例值
/// </summary>
public decimal SchoolReNewRatioValue { get; set; }
/// <summary>
/// 转介首次报名返佣比例
/// </summary>
public decimal TransIntroductceRatio { get; set; }
/// <summary>
/// 转介首次报名返佣类型
/// </summary>
public CourseRebateSetEnum TransIntroductceRatioType { get; set; }
/// <summary>
/// 转介首次报名返佣课程比例值
/// </summary>
public decimal TransIntroductceRatioValue { get; set; }
/// <summary>
/// 转介续费返佣比例
/// </summary>
public decimal TransIntroductceReNewRatio { get; set; }
/// <summary>
/// 转介续费返佣类型
/// </summary>
public CourseRebateSetEnum TransIntroductceReNewRatioType { get; set; }
/// <summary>
/// 转介续费返佣课程比例值
/// </summary>
public decimal TransIntroductceReNewRatioValue { get; set; }
/// <summary>
/// 內推首次报名返佣比例
/// </summary>
public decimal InnerRecommendRatio { get; set; }
/// <summary>
/// 內推首次报名返佣类型
/// </summary>
public CourseRebateSetEnum InnerRecommendRatioType { get; set; }
/// <summary>
/// 內推首次报名返佣课程比例值
/// </summary>
public decimal InnerRecommendRatioValue { get; set; }
/// <summary>
/// 內推续费返佣比例
/// </summary>
public decimal InnerRecommendReNewRatio { get; set; }
/// <summary>
/// 內推续费返佣类型
/// </summary>
public CourseRebateSetEnum InnerRecommendReNewRatioType { get; set; }
/// <summary>
/// 內推续费返佣课程比例值
/// </summary>
public decimal? InnerRecommendReNewRatioValue { get; set; }
/// <summary>
/// 返佣类型 1按课耗反 2付款返佣
/// </summary>
......
Edu.Module.Course/CourseModule.cs
View file @ 620f29c7
......@@ -1479,14 +1479,39 @@ namespace Edu.Module.Course
{nameof(RB_Course_ViewModel.SellPrice),courseModel.SellPrice },
{nameof(RB_Course_ViewModel.B2CRatio),courseModel.B2CRatio },
{nameof(RB_Course_ViewModel.B2CReNewRatio),courseModel.B2CReNewRatio },
{nameof(RB_Course_ViewModel.B2BRebateRatio),courseModel.B2BRebateRatio },
{nameof(RB_Course_ViewModel.B2BRebateRatioType),courseModel.B2BRebateRatioType },
{nameof(RB_Course_ViewModel.B2BRebateRatioValue),courseModel.B2BRebateRatioValue },
{nameof(RB_Course_ViewModel.B2BReNewRatio),courseModel.B2BReNewRatio },
{nameof(RB_Course_ViewModel.B2BReNewRatioType),courseModel.B2BReNewRatioType },
{nameof(RB_Course_ViewModel.B2BReNewRatioValue),courseModel.B2BReNewRatioValue },
{nameof(RB_Course_ViewModel.SchoolRebateRatio),courseModel.SchoolRebateRatio },
{nameof(RB_Course_ViewModel.SchoolRebateRatioType),courseModel.SchoolRebateRatioType },
{nameof(RB_Course_ViewModel.SchoolRebateRatioValue),courseModel.SchoolRebateRatioValue },
{nameof(RB_Course_ViewModel.SchoolReNewRatio),courseModel.SchoolReNewRatio },
{nameof(RB_Course_ViewModel.SchoolReNewRatioType),courseModel.SchoolReNewRatioType },
{nameof(RB_Course_ViewModel.SchoolReNewRatioValue),courseModel.SchoolReNewRatioValue },
{nameof(RB_Course_ViewModel.InnerRecommendRatio),courseModel.InnerRecommendRatio },
{nameof(RB_Course_ViewModel.InnerRecommendRatioType),courseModel.InnerRecommendRatioType },
{nameof(RB_Course_ViewModel.InnerRecommendRatioValue),courseModel.InnerRecommendRatioValue },
{nameof(RB_Course_ViewModel.InnerRecommendReNewRatio),courseModel.InnerRecommendReNewRatio },
{nameof(RB_Course_ViewModel.InnerRecommendReNewRatioType),courseModel.InnerRecommendReNewRatioType },
{nameof(RB_Course_ViewModel.InnerRecommendReNewRatioValue),courseModel.InnerRecommendReNewRatioValue },
{nameof(RB_Course_ViewModel.TransIntroductceRatio),courseModel.TransIntroductceRatio },
{nameof(RB_Course_ViewModel.TransIntroductceRatioType),courseModel.TransIntroductceRatioType },
{nameof(RB_Course_ViewModel.TransIntroductceRatioValue),courseModel.TransIntroductceRatioValue },
{nameof(RB_Course_ViewModel.TransIntroductceReNewRatio),courseModel.TransIntroductceReNewRatio },
{nameof(RB_Course_ViewModel.TransIntroductceReNewRatioType),courseModel.TransIntroductceReNewRatioType },
{nameof(RB_Course_ViewModel.TransIntroductceReNewRatioValue),courseModel.TransIntroductceReNewRatioValue },
{nameof(RB_Course_ViewModel.CommissionReType),courseModel.CommissionReType },
};
flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), courseModel.CourseId));
......
Edu.WebApi/Controllers/Course/CourseController.cs
View file @ 620f29c7
......@@ -1223,14 +1223,39 @@ namespace Edu.WebApi.Controllers.Course
SellPrice = courseObj.GetDecimal("SellPrice"),
B2CRatio = courseObj.GetDecimal("B2CRatio"),
B2CReNewRatio = courseObj.GetDecimal("B2CReNewRatio"),
B2BRebateRatio = courseObj.GetDecimal("B2BRebateRatio"),
B2BRebateRatioType= (CourseRebateSetEnum)courseObj.GetInt("B2BRebateRatioType"),
B2BRebateRatioValue= courseObj.GetDecimal("B2BRebateRatioValue"),
B2BReNewRatio = courseObj.GetDecimal("B2BReNewRatio"),
B2BReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("B2BReNewRatioType"),
B2BReNewRatioValue= courseObj.GetDecimal("B2BReNewRatioValue"),
SchoolRebateRatio = courseObj.GetDecimal("SchoolRebateRatio"),
SchoolRebateRatioType= (CourseRebateSetEnum)courseObj.GetInt("SchoolRebateRatioType"),
SchoolRebateRatioValue= courseObj.GetDecimal("SchoolRebateRatioValue"),
SchoolReNewRatio = courseObj.GetDecimal("SchoolReNewRatio"),
InnerRecommendRatio=courseObj.GetDecimal("InnerRecommendRatio"),
InnerRecommendReNewRatio=courseObj.GetDecimal("InnerRecommendReNewRatio"),
TransIntroductceRatio=courseObj.GetDecimal("TransIntroductceRatio"),
TransIntroductceReNewRatio=courseObj.GetDecimal("TransIntroductceReNewRatio"),
SchoolReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("SchoolReNewRatioType"),
SchoolReNewRatioValue = courseObj.GetDecimal("SchoolReNewRatioValue"),
InnerRecommendRatio =courseObj.GetDecimal("InnerRecommendRatio"),
InnerRecommendRatioType = (CourseRebateSetEnum)courseObj.GetInt("InnerRecommendRatioType"),
InnerRecommendRatioValue= courseObj.GetDecimal("InnerRecommendRatioValue"),
InnerRecommendReNewRatio =courseObj.GetDecimal("InnerRecommendReNewRatio"),
InnerRecommendReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("InnerRecommendReNewRatioType"),
InnerRecommendReNewRatioValue= courseObj.GetDecimal("InnerRecommendReNewRatioValue"),
TransIntroductceRatio =courseObj.GetDecimal("TransIntroductceRatio"),
TransIntroductceRatioType = (CourseRebateSetEnum)courseObj.GetInt("TransIntroductceRatioType"),
TransIntroductceRatioValue = courseObj.GetDecimal("TransIntroductceRatioValue"),
TransIntroductceReNewRatio =courseObj.GetDecimal("TransIntroductceReNewRatio"),
TransIntroductceReNewRatioType = (CourseRebateSetEnum)courseObj.GetInt("TransIntroductceReNewRatioType"),
TransIntroductceReNewRatioValue = courseObj.GetDecimal("TransIntroductceReNewRatioValue"),
CommissionReType = courseObj.GetInt("CommissionReType")
};
var priceObj = base.ParmJObj.GetStringValue("priceList");
......@@ -1290,14 +1315,39 @@ namespace Edu.WebApi.Controllers.Course
extModel.SellPrice = courseModel.SellPrice;
extModel.B2CRatio = courseModel.B2CRatio;
extModel.B2CReNewRatio = courseModel.B2CReNewRatio;
extModel.B2BRebateRatio = courseModel.B2BRebateRatio;
extModel.B2BRebateRatioType = courseModel.B2BRebateRatioType;
extModel.B2BRebateRatioValue = courseModel.B2BRebateRatioValue;
extModel.B2BReNewRatio = courseModel.B2BReNewRatio;
extModel.B2BReNewRatioType = courseModel.B2BReNewRatioType;
extModel.B2BReNewRatioValue = courseModel.B2BReNewRatioValue;
extModel.SchoolRebateRatio = courseModel.SchoolRebateRatio;
extModel.SchoolRebateRatioType = courseModel.SchoolRebateRatioType;
extModel.SchoolRebateRatioValue = courseModel.SchoolRebateRatioValue;
extModel.SchoolReNewRatio = courseModel.SchoolReNewRatio;
extModel.SchoolReNewRatioType = courseModel.SchoolReNewRatioType;
extModel.SchoolReNewRatioValue = courseModel.SchoolReNewRatioValue;
extModel.InnerRecommendRatio = courseModel.InnerRecommendRatio;
extModel.InnerRecommendRatioType = courseModel.InnerRecommendRatioType;
extModel.InnerRecommendRatioValue= courseModel.InnerRecommendRatioValue;
extModel.InnerRecommendReNewRatio = courseModel.InnerRecommendReNewRatio;
extModel.InnerRecommendReNewRatioType = courseModel.InnerRecommendReNewRatioType;
extModel.InnerRecommendReNewRatioValue = courseModel.InnerRecommendReNewRatioValue;
extModel.TransIntroductceRatio = courseModel.TransIntroductceRatio;
extModel.TransIntroductceRatioType = courseModel.TransIntroductceRatioType;
extModel.TransIntroductceRatioValue = courseModel.TransIntroductceRatioValue;
extModel.TransIntroductceReNewRatio = courseModel.TransIntroductceReNewRatio;
extModel.TransIntroductceReNewRatioType = courseModel.TransIntroductceReNewRatioType;
extModel.TransIntroductceReNewRatioValue = courseModel.TransIntroductceReNewRatioValue;
extModel.CommissionReType = courseModel.CommissionReType;
var flag = courseModule.SetCoursePreferentialListModule(extModel, list);
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 620f29c7
......@@ -1265,10 +1265,11 @@ namespace Edu.WebApi.Controllers.User
if (extModel != null && extModel.CreateBy > 0)
{
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? "";
}
if (customer != null)
{
PushMessage(extModel);
if (customer != null)
{
Common.Plugin.LogHelper.Write("查重推送消息");
PushMessage(extModel);
}
}
return ApiResult.Success(data: extModel);
}
......
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