Commit 6f4518dd authored by 黄奎's avatar 黄奎

页面修改

parent 2f24311f
......@@ -273,5 +273,16 @@ namespace Edu.Model.ViewModel.Sell
/// 学习目的
/// </summary>
public string LearningGoalsName { get; set; }
/// <summary>
/// QQ号码
/// </summary>
public string QQ { get; set; }
/// <summary>
/// 微信号
/// </summary>
public string WeChatNo { get; set; }
}
}
\ No newline at end of file
......@@ -1103,7 +1103,9 @@ namespace Edu.Module.Course
MakeUpHours = 0,
StuIcon = item.StuIcon,
TotalHours = Convert.ToInt32(courseModel.ClassHours),
RenewState = item.IsRenewGuest == 1 ? 2 : 1
RenewState = item.IsRenewGuest == 1 ? 2 : 1,
QQ=item.QQ,
WeChatNo=item.WeChatNo,
};
SetOrderGuestInfo(guestModel, out string Nmessage);
......@@ -2468,14 +2470,37 @@ namespace Edu.Module.Course
}
#region 新增修改学员账号
if (flag &&!string.IsNullOrEmpty(dmodel.Mobile))
if (flag )
{
//学员表
var stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
RB_Student_ViewModel stuModel = null;
if (!string.IsNullOrEmpty(dmodel.Mobile))
{
Group_Id = dmodel.Group_Id,
StuTel = dmodel.Mobile
});
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
StuTel = dmodel.Mobile
});
}
if (stuModel == null && !string.IsNullOrEmpty(dmodel.QQ))
{
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
QQ = dmodel.QQ
});
}
if (stuModel == null && !string.IsNullOrEmpty(dmodel.WeChatNo))
{
//学员表
stuModel = studentRepository.GetStuByTelRepository(new RB_Student_ViewModel()
{
Group_Id = dmodel.Group_Id,
WeChatNo = dmodel.WeChatNo
});
}
//不存在存在学员基本信息
if (stuModel == null)
{
......
......@@ -592,20 +592,20 @@ namespace Edu.Module.User
var assistList = GetStuAssistListModule(model.StuId);
var customerModel = customerRepository.GetEntity(model.CustomerId);
string searchContent = model.StuTel;
string searchContent = model.StuTel + "(学员电话)";
if (type == 2)
{
searchContent = model.QQ;
searchContent = model.QQ + "(学员电话)";
}
if (type == 3)
{
searchContent = model.WeChatNo;
searchContent = model.WeChatNo + "(学员微信)";
}
string createByName = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
{
Id = model.CreateBy
})?.FirstOrDefault()?.AccountName ?? "";
string markdownContent = $"`同业查重通知` \n>**概要信息** \n>同业名称:{customerModel?.CustomerName ?? ""}({customerModel?.ContactNumber ?? ""})\n>查询内容:{searchContent} \n>关联学员:{model.StuName}\n>关联学员电话:{model.StuTel}\n>";
string markdownContent = $"`同业查重通知` \n>**概要信息** \n>同业名称:{customerModel?.CustomerName ?? ""}({customerModel?.ContactNumber ?? ""})\n>查询内容:{searchContent} \n>关联学员:{model.StuName}\n>";
markdownContent += $"关联同事:{ createByName}\n> ";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
......
......@@ -2474,5 +2474,29 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success("获取成功", data: result);
}
#endregion
#region 用户中心 学员和奖金统计
/// <summary>
/// 人员统计
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult PersonnelStatic()
{
return ApiResult.Failed();
}
/// <summary>
/// 人员奖励统计
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult PersonnelBonusStatic()
{
return ApiResult.Failed();
}
#endregion
}
}
\ No newline at end of file
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