Skip to content

E
Education
Commit 9d100207 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 1a37cad7
Show whitespace changes
Inline Side-by-side
Showing with 266 additions and 164 deletions
Edu.Model/Entity/Sell/RB_Order.cs
View file @ 9d100207
...@@ -345,5 +345,30 @@ namespace Edu.Model.Entity.Sell ...@@ -345,5 +345,30 @@ namespace Edu.Model.Entity.Sell
/// 是否已回归原班(1-是) /// 是否已回归原班(1-是)
/// </summary> /// </summary>
public int IsBackClass { get; set; } public int IsBackClass { get; set; }
/// <summary>
/// 同业ID
/// </summary>
public int CustomerId { get; set; }
/// <summary>
/// 付款状态 1已付款 2未付款
/// </summary>
public int PayState { get; set; }
/// <summary>
/// 付款时间
/// </summary>
public DateTime? PayDate { get; set; }
/// <summary>
/// 兑换奖品人数
/// </summary>
public int ExchangeNum { get; set; }
/// <summary>
/// 兑换奖品金额
/// </summary>
public decimal ExchangeMoney { get; set; }
} }
} }
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ 9d100207
...@@ -141,5 +141,10 @@ namespace Edu.Model.ViewModel.User ...@@ -141,5 +141,10 @@ namespace Edu.Model.ViewModel.User
/// 学员状态 /// 学员状态
/// </summary> /// </summary>
public GuestStateEnum StuGuestState { get; set; } public GuestStateEnum StuGuestState { get; set; }
/// <summary>
/// 账号表主键编号
/// </summary>
public int Account_Id { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/OrderModule.cs
View file @ 9d100207
...@@ -405,7 +405,7 @@ namespace Edu.Module.Course ...@@ -405,7 +405,7 @@ namespace Edu.Module.Course
{ {
if ((renewOrderDiscount?.PriceType ?? 0) == 0) if ((renewOrderDiscount?.PriceType ?? 0) == 0)
{ {
demodel.DiscountMoney = coursePrice- coursePrice * (100 - (renewOrderDiscount?.PriceMoney ?? 0)) / 100; demodel.DiscountMoney = coursePrice - coursePrice * (100 - (renewOrderDiscount?.PriceMoney ?? 0)) / 100;
demodel.SaleRemark = "续费报名优惠" + renewOrderDiscount.PriceMoney + "%"; demodel.SaleRemark = "续费报名优惠" + renewOrderDiscount.PriceMoney + "%";
} }
else else
...@@ -1198,7 +1198,6 @@ namespace Edu.Module.Course ...@@ -1198,7 +1198,6 @@ namespace Edu.Module.Course
} }
/// <summary> /// <summary>
/// 获取订单阶梯价格 /// 获取订单阶梯价格
/// </summary> /// </summary>
...@@ -1237,11 +1236,14 @@ namespace Edu.Module.Course ...@@ -1237,11 +1236,14 @@ namespace Edu.Module.Course
{ {
return false; return false;
} }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order_ViewModel.EnterID),careOfPeople} { nameof(RB_Order_ViewModel.EnterID),careOfPeople}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Order_ViewModel.OrderId), FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId, FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1318,7 +1320,6 @@ namespace Edu.Module.Course ...@@ -1318,7 +1320,6 @@ namespace Edu.Module.Course
SourceId = orderId SourceId = orderId
}); });
#region 更新甲鹤小程序规格对应的库存 #region 更新甲鹤小程序规格对应的库存
if (flag && orderModel.JoinType != OrderJoinTypeEnum.RenewOrder)//续费订单不去更新规格库存 if (flag && orderModel.JoinType != OrderJoinTypeEnum.RenewOrder)//续费订单不去更新规格库存
{ {
...@@ -1450,11 +1451,14 @@ namespace Edu.Module.Course ...@@ -1450,11 +1451,14 @@ namespace Edu.Module.Course
{ {
return "不能转交给同一人"; return "不能转交给同一人";
} }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order_ViewModel.EnterID),enterID} { nameof(RB_Order_ViewModel.EnterID),enterID}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Order_ViewModel.OrderId), FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId, FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1530,8 +1534,10 @@ namespace Edu.Module.Course ...@@ -1530,8 +1534,10 @@ namespace Edu.Module.Course
LogContent = "修改销售备注：由【" + orderModel.SaleRemark + "】修改为【" + remark + "】"; LogContent = "修改销售备注：由【" + orderModel.SaleRemark + "】修改为【" + remark + "】";
} }
else { return false; } else { return false; }
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Order_ViewModel.OrderId), FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId, FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1624,11 +1630,14 @@ namespace Edu.Module.Course ...@@ -1624,11 +1630,14 @@ namespace Edu.Module.Course
return false; return false;
} }
if (orderModel.CommissionMoney == commissionMoney) { return true; } if (orderModel.CommissionMoney == commissionMoney) { return true; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order_ViewModel.CommissionMoney),commissionMoney} { nameof(RB_Order_ViewModel.CommissionMoney),commissionMoney}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Order_ViewModel.OrderId), FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId, FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1655,12 +1664,15 @@ namespace Edu.Module.Course ...@@ -1655,12 +1664,15 @@ namespace Edu.Module.Course
{ {
if (orderModel.ExtraRewardMoney != extraRewardMoney || orderModel.ExtraDeductMoney != extraDeductMoney) if (orderModel.ExtraRewardMoney != extraRewardMoney || orderModel.ExtraDeductMoney != extraDeductMoney)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order_ViewModel.ExtraRewardMoney),extraRewardMoney}, { nameof(RB_Order_ViewModel.ExtraRewardMoney),extraRewardMoney},
{ nameof(RB_Order_ViewModel.ExtraDeductMoney),extraDeductMoney} { nameof(RB_Order_ViewModel.ExtraDeductMoney),extraDeductMoney}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Order_ViewModel.OrderId), FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId, FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1787,15 +1799,18 @@ namespace Edu.Module.Course ...@@ -1787,15 +1799,18 @@ namespace Edu.Module.Course
{ {
var orderModel = orderRepository.GetEntity(orderId); var orderModel = orderRepository.GetEntity(orderId);
if (orderModel == null) { return false; } if (orderModel == null) { return false; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Order_ViewModel.PreferPrice),preferPrice} { nameof(RB_Order_ViewModel.PreferPrice),preferPrice}
}; };
if (orderModel.PreferPrice != preferPrice) if (orderModel.PreferPrice != preferPrice)
{ {
keyValues.Add(nameof(RB_Order_ViewModel.IsCommissionGiveOK), 0); keyValues.Add(nameof(RB_Order_ViewModel.IsCommissionGiveOK), 0);
} }
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Order_ViewModel.OrderId), FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId, FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -2128,7 +2143,7 @@ namespace Edu.Module.Course ...@@ -2128,7 +2143,7 @@ namespace Edu.Module.Course
else else
{ {
//创建学生表信息 //创建学生表信息
int StudentId = studentRepository.Insert(new Model.Entity.User.RB_Student() var stuModel = new RB_Student_ViewModel()
{ {
StuId = 0, StuId = 0,
AreaId = 0, AreaId = 0,
...@@ -2147,38 +2162,23 @@ namespace Edu.Module.Course ...@@ -2147,38 +2162,23 @@ namespace Edu.Module.Course
StuTel = dmodel.Mobile, StuTel = dmodel.Mobile,
UpdateBy = dmodel.CreateBy, UpdateBy = dmodel.CreateBy,
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
}); };
//创建学生账号 studentRepository.SetStudentRepository(stuModel);
int AccountId = accountRepository.Insert(new Model.Entity.User.RB_Account()
{
Id = 0,
Account = dmodel.Mobile,
AccountId = StudentId,
AccountType = Common.Enum.User.AccountTypeEnum.Student,
AnnualLeaveDay = 0,
CreateBy = dmodel.CreateBy,
CreateTime = DateTime.Now,
Group_Id = dmodel.Group_Id,
School_Id = classmodel.School_Id,
Status = DateStateEnum.Normal,
UpdateBy = dmodel.UpdateBy,
UpdateTime = DateTime.Now,
Password = Common.DES.Encrypt(Common.Config.DefaultPwd)
});
//创建【学员表、学生表、账号表】关联信息 //创建【学员表、学生表、账号表】关联信息
student_OrderGuestRepository.Insert(new Model.Entity.User.RB_Student_OrderGuest() student_OrderGuestRepository.Insert(new Model.Entity.User.RB_Student_OrderGuest()
{ {
Id = 0, Id = 0,
Account_Id = AccountId, Account_Id = stuModel.Account_Id,
ClassId = ordermodel.ClassId, ClassId = ordermodel.ClassId,
CreateBy = dmodel.CreateBy, CreateBy = dmodel.CreateBy,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
GuestId = dmodel.Id, GuestId = dmodel.Id,
OrderId = dmodel.OrderId, OrderId = dmodel.OrderId,
Status = DateStateEnum.Normal, Status = DateStateEnum.Normal,
Student_Id = StudentId Student_Id = stuModel.StuId
}); });
LogContent += ",自动创建学生账号【" + AccountId + "】"; LogContent += ",自动创建学生账号【" + stuModel.Account_Id + "】";
} }
} }
#endregion #endregion
...@@ -2910,7 +2910,6 @@ namespace Edu.Module.Course ...@@ -2910,7 +2910,6 @@ namespace Edu.Module.Course
} }
#endregion #endregion
#region 个人中心 #region 个人中心
/// <summary> /// <summary>
/// 获取我的未完成的订单 /// 获取我的未完成的订单
...@@ -2937,7 +2936,6 @@ namespace Edu.Module.Course ...@@ -2937,7 +2936,6 @@ namespace Edu.Module.Course
} }
#endregion #endregion
#region 更新甲鹤小程序对应的班级招生人数 #region 更新甲鹤小程序对应的班级招生人数
/// <summary> /// <summary>
/// 下单更新甲鹤小程序规格对应的班级人数 /// 下单更新甲鹤小程序规格对应的班级人数
...@@ -3277,7 +3275,7 @@ namespace Edu.Module.Course ...@@ -3277,7 +3275,7 @@ namespace Edu.Module.Course
IsPublic = 1, IsPublic = 1,
BType = 1,//item.AccountType, BType = 1,//item.AccountType,
AccountId = financeConfig?.ClientID ?? 54, AccountId = financeConfig?.ClientID ?? 54,
WBMoney = Convert.ToDecimal(demodel.PreferPrice- demodel.PlatformTax), WBMoney = Convert.ToDecimal(demodel.PreferPrice - demodel.PlatformTax),
TradeDate = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"), TradeDate = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"),
AccountNumber = System.DateTime.Now.AddDays(-1).ToString("yyyyMMdd"), AccountNumber = System.DateTime.Now.AddDays(-1).ToString("yyyyMMdd"),
TemplateId = financeConfig?.TempleteId ?? 139, TemplateId = financeConfig?.TempleteId ?? 139,
......
Edu.Module.Course/OrderModule2.cs
View file @ 9d100207
...@@ -67,7 +67,7 @@ namespace Edu.Module.Course ...@@ -67,7 +67,7 @@ namespace Edu.Module.Course
/// <param name="StateMent">退课协议申明</param> /// <param name="StateMent">退课协议申明</param>
/// <param name="message"></param> /// <param name="message"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool CreateBackClassApplyModule(int GuestId, int OrderId, string reason, UserInfo userinfo,string receiptFile,string BackAccountName,string BackAccount,string StateMent,out string message) public virtual bool CreateBackClassApplyModule(int GuestId, int OrderId, string reason, UserInfo userinfo, string receiptFile, string BackAccountName, string BackAccount, string StateMent, out string message)
{ {
bool flag; bool flag;
message = ""; message = "";
...@@ -98,7 +98,8 @@ namespace Edu.Module.Course ...@@ -98,7 +98,8 @@ namespace Edu.Module.Course
AccountType = Common.Enum.User.AccountTypeEnum.Teacher AccountType = Common.Enum.User.AccountTypeEnum.Teacher
})?.FirstOrDefault(); })?.FirstOrDefault();
var teacherId = teacherModel?.Id ?? 0; var teacherId = teacherModel?.Id ?? 0;
var saleMan = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { var saleMan = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Id = orderModel.EnterID Id = orderModel.EnterID
})?.FirstOrDefault(); })?.FirstOrDefault();
var totalBackCount = student_BackClassRepository.GetStudentBackClassNumRepository(); var totalBackCount = student_BackClassRepository.GetStudentBackClassNumRepository();
...@@ -125,9 +126,9 @@ namespace Edu.Module.Course ...@@ -125,9 +126,9 @@ namespace Edu.Module.Course
} }
//预计退款金额 //预计退款金额
decimal backMoney =0; decimal backMoney = 0;
backMoney = orderRepository.CalcBackMoneyRepository(orderModel, courseModel, FinishHours,out _); backMoney = orderRepository.CalcBackMoneyRepository(orderModel, courseModel, FinishHours, out _);
var backClassModel = new RB_Student_BackClass_ViewModel() var backClassModel = new RB_Student_BackClass_ViewModel()
{ {
...@@ -147,8 +148,8 @@ namespace Edu.Module.Course ...@@ -147,8 +148,8 @@ namespace Edu.Module.Course
OrderId = OrderId, OrderId = OrderId,
ApplyReason = reason, ApplyReason = reason,
FlowId = Common.Config.BackClassFlowId, FlowId = Common.Config.BackClassFlowId,
BackAccountName=BackAccountName, BackAccountName = BackAccountName,
BackAccount=BackAccount, BackAccount = BackAccount,
}; };
var newBackId = student_BackClassRepository.Insert(backClassModel); var newBackId = student_BackClassRepository.Insert(backClassModel);
backClassModel.BackId = newBackId; backClassModel.BackId = newBackId;
...@@ -157,21 +158,21 @@ namespace Edu.Module.Course ...@@ -157,21 +158,21 @@ namespace Edu.Module.Course
{ {
flag = education_ReceiptRepository.SetEducationReceiptRepository(new RB_Education_Receipt() flag = education_ReceiptRepository.SetEducationReceiptRepository(new RB_Education_Receipt()
{ {
Id=0, Id = 0,
Title="退课单据", Title = "退课单据",
ClassId=orderModel.ClassId, ClassId = orderModel.ClassId,
OrderId=orderModel.OrderId, OrderId = orderModel.OrderId,
ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.BackClass, ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.BackClass,
RelationId= backClassModel.BackId, RelationId = backClassModel.BackId,
Group_Id=orderModel.Group_Id, Group_Id = orderModel.Group_Id,
School_Id=orderModel.School_Id, School_Id = orderModel.School_Id,
CreateBy=userinfo.Id, CreateBy = userinfo.Id,
CreateTime=DateTime.Now, CreateTime = DateTime.Now,
UpdateBy=userinfo.Id, UpdateBy = userinfo.Id,
UpdateTime=DateTime.Now, UpdateTime = DateTime.Now,
RecipientIds="", RecipientIds = "",
VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit, VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
ReceiptFile= receiptFile ReceiptFile = receiptFile
}, out message); }, out message);
if (flag) if (flag)
{ {
...@@ -200,31 +201,31 @@ namespace Edu.Module.Course ...@@ -200,31 +201,31 @@ namespace Edu.Module.Course
string ProtocolNum = (contractModel?.ContractNo ?? "") + "-T"; string ProtocolNum = (contractModel?.ContractNo ?? "") + "-T";
RB_BackClass_Protocol model = new RB_BackClass_Protocol() RB_BackClass_Protocol model = new RB_BackClass_Protocol()
{ {
Id=0, Id = 0,
BackId= newBackId, BackId = newBackId,
ProtocolNum= ProtocolNum, ProtocolNum = ProtocolNum,
PartyAName=guestModel.GuestName, PartyAName = guestModel.GuestName,
PartyAGuardian="", PartyAGuardian = "",
PartyBName= "成都市锦江区甲鹤外语培训学校有限公司", PartyBName = "成都市锦江区甲鹤外语培训学校有限公司",
PartyBLegal="", PartyBLegal = "",
SignDate=null, SignDate = null,
OldSaleMan= saleMan?.AccountName??"", OldSaleMan = saleMan?.AccountName ?? "",
OldCourseName=courseModel?.CourseName??"", OldCourseName = courseModel?.CourseName ?? "",
OldSellPrice=courseModel?.SellPrice??0, OldSellPrice = courseModel?.SellPrice ?? 0,
OldDiscountMoney=orderModel?.PerDiscountMoney??0, OldDiscountMoney = orderModel?.PerDiscountMoney ?? 0,
OldIncome=((orderModel?.Income ?? 0) + (orderModel?.PlatformTax ?? 0) - (orderModel?.Refund ?? 0))/orderModel.GuestNum, OldIncome = ((orderModel?.Income ?? 0) + (orderModel?.PlatformTax ?? 0) - (orderModel?.Refund ?? 0)) / orderModel.GuestNum,
OldFinaceNum= FinaceNum, OldFinaceNum = FinaceNum,
OldReceiveMan=saleMan?.AccountName??"", OldReceiveMan = saleMan?.AccountName ?? "",
TotalClassHours=guestModel.TotalHours, TotalClassHours = guestModel.TotalHours,
CompleteHours=guestModel.CompleteHours, CompleteHours = guestModel.CompleteHours,
SurplusHours= guestModel.TotalHours- guestModel.CompleteHours, SurplusHours = guestModel.TotalHours - guestModel.CompleteHours,
BackMoney= backClassModel.BackMoney, BackMoney = backClassModel.BackMoney,
AuditStatus=(int)Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit, AuditStatus = (int)Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
CreateBy=orderModel.EnterID, CreateBy = orderModel.EnterID,
CreateTime=DateTime.Now, CreateTime = DateTime.Now,
Group_Id= classModel.Group_Id, Group_Id = classModel.Group_Id,
School_Id=classModel.School_Id, School_Id = classModel.School_Id,
StateMent=StateMent StateMent = StateMent
}; };
flag = backClass_ProtocolRepository.Insert(model) > 0; flag = backClass_ProtocolRepository.Insert(model) > 0;
} }
......
Edu.Module.User/StudentModule.cs
View file @ 9d100207
...@@ -146,39 +146,7 @@ namespace Edu.Module.User ...@@ -146,39 +146,7 @@ namespace Edu.Module.User
/// <returns></returns> /// <returns></returns>
public bool SetStudentModule(RB_Student_ViewModel model) public bool SetStudentModule(RB_Student_ViewModel model)
{ {
bool flag; bool flag = studentRepository.SetStudentRepository(model);
if (model.StuId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_ViewModel.StuName),model.StuName.Trim() },
{nameof(RB_Student_ViewModel.StuTel),model.StuTel.Trim() },
{nameof(RB_Student_ViewModel.StuIcon),model.StuIcon.Trim() },
{nameof(RB_Student_ViewModel.StuSex),model.StuSex },
{nameof(RB_Student_ViewModel.StuBirth),model.StuBirth },
{nameof(RB_Student_ViewModel.ProviceId),model.ProviceId },
{nameof(RB_Student_ViewModel.CityId),model.CityId },
{nameof(RB_Student_ViewModel.AreaId),model.AreaId },
{nameof(RB_Student_ViewModel.Interest),model.Interest },
{nameof(RB_Student_ViewModel.JapanBaseInfo),model.JapanBaseInfo },
{nameof(RB_Student_ViewModel.StuProfession),model.StuProfession },
{nameof(RB_Student_ViewModel.StuEducation),model.StuEducation },
{nameof(RB_Student_ViewModel.StuPurpose),model.StuPurpose },
{nameof(RB_Student_ViewModel.StuSource),model.StuSource },
{nameof(RB_Student_ViewModel.StuAddress),model.StuAddress },
{nameof(RB_Student_ViewModel.StuContract),model.StuContract },
{nameof(RB_Student_ViewModel.StuContractMobile),model.StuContractMobile },
{nameof(RB_Student_ViewModel.StuIDCard),model.StuIDCard },
{nameof(RB_Student_ViewModel.StuIDCardAddress),model.StuIDCardAddress },
};
flag = studentRepository.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
}
else
{
var newId = studentRepository.Insert(model);
model.StuId = newId;
flag = newId > 0;
}
return flag; return flag;
} }
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ 9d100207
...@@ -26,10 +26,6 @@ namespace Edu.Repository.Sell ...@@ -26,10 +26,6 @@ namespace Edu.Repository.Sell
{ {
where += $@" and o.{nameof(RB_Order_ViewModel.Group_Id)} ={demodel.Group_Id}"; where += $@" and o.{nameof(RB_Order_ViewModel.Group_Id)} ={demodel.Group_Id}";
} }
//if (demodel.School_Id > 0)
//{
// where += $@" and o.{nameof(RB_Order_ViewModel.School_Id)} ={demodel.School_Id}";
//}
if (demodel.OrderId > 0) if (demodel.OrderId > 0)
{ {
where += $@" and o.{nameof(RB_Order_ViewModel.OrderId)} ={demodel.OrderId}"; where += $@" and o.{nameof(RB_Order_ViewModel.OrderId)} ={demodel.OrderId}";
...@@ -256,6 +252,10 @@ ORDER BY {orderBy} ...@@ -256,6 +252,10 @@ ORDER BY {orderBy}
{ {
where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {demodel.CourseSubject}"; where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {demodel.CourseSubject}";
} }
if (demodel.CustomerId > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.CustomerId)} = {demodel.CustomerId}";
}
string orderBy = " o.OrderId asc"; string orderBy = " o.OrderId asc";
if (demodel.Q_OrderBy == 1) if (demodel.Q_OrderBy == 1)
{ {
...@@ -842,7 +842,6 @@ GROUP BY o.EnterID ...@@ -842,7 +842,6 @@ GROUP BY o.EnterID
#endregion #endregion
#region 未完成的订单 #region 未完成的订单
/// <summary> /// <summary>
/// 获取我的未完成的订单 /// 获取我的未完成的订单
......
Edu.Repository/Sell/RB_Order_GuestRepository.cs
View file @ 9d100207
...@@ -251,10 +251,6 @@ WHERE 1=1 AND A.Status=0 ...@@ -251,10 +251,6 @@ WHERE 1=1 AND A.Status=0
{ {
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
} }
//if (demodel.School_Id > 0)
//{
// where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
//}
if (demodel.Id > 0) if (demodel.Id > 0)
{ {
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
...@@ -568,7 +564,6 @@ WHERE {where}"; ...@@ -568,7 +564,6 @@ WHERE {where}";
return Get<RB_Order_Guest_ViewModel>(sql).ToList(); return Get<RB_Order_Guest_ViewModel>(sql).ToList();
} }
#region 临时上课邀请学生查询 #region 临时上课邀请学生查询
/// <summary> /// <summary>
/// 获取列表 /// 获取列表
...@@ -638,8 +633,6 @@ WHERE {where}"; ...@@ -638,8 +633,6 @@ WHERE {where}";
#endregion #endregion
#region 学员名单 #region 学员名单
/// <summary> /// <summary>
/// 获取学员名单分页列表 /// 获取学员名单分页列表
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ 9d100207
using Edu.Common.Enum; using Edu.Common.Enum;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using VT.FW.DB;
using VT.FW.DB.Dapper; using VT.FW.DB.Dapper;
namespace Edu.Repository.User namespace Edu.Repository.User
...@@ -12,6 +14,11 @@ namespace Edu.Repository.User ...@@ -12,6 +14,11 @@ namespace Edu.Repository.User
/// </summary> /// </summary>
public class RB_StudentRepository : BaseRepository<Model.Entity.User.RB_Student> public class RB_StudentRepository : BaseRepository<Model.Entity.User.RB_Student>
{ {
/// <summary>
/// 账号
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary> /// <summary>
/// 获取学生列表 /// 获取学生列表
/// </summary> /// </summary>
...@@ -161,7 +168,6 @@ where b.`Status`=0 and b.ClassStatus in(1,2) and a.status=0 and a.Account_Id={ ...@@ -161,7 +168,6 @@ where b.`Status`=0 and b.ClassStatus in(1,2) and a.status=0 and a.Account_Id={
} }
/// <summary> /// <summary>
/// 根据学生id获取学生的班级课程学校信息 /// 根据学生id获取学生的班级课程学校信息
/// </summary> /// </summary>
...@@ -183,5 +189,62 @@ FROM rb_student as s LEFT JOIN rb_student_orderguest as sog on s.StuId=sog.Stude ...@@ -183,5 +189,62 @@ FROM rb_student as s LEFT JOIN rb_student_orderguest as sog on s.StuId=sog.Stude
WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 and cou.`Status`=0 and c.`Status`=0 and s.`Status`=0 and s.StuId={Student_Id} and s.Group_Id={Group_Id}"); WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 and cou.`Status`=0 and c.`Status`=0 and s.`Status`=0 and s.StuId={Student_Id} and s.Group_Id={Group_Id}");
return Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList(); return Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList();
} }
public bool SetStudentRepository(RB_Student_ViewModel model)
{
bool flag;
if (model.StuId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_ViewModel.StuName),model.StuName.Trim() },
{nameof(RB_Student_ViewModel.StuTel),model.StuTel.Trim() },
{nameof(RB_Student_ViewModel.StuIcon),model.StuIcon.Trim() },
{nameof(RB_Student_ViewModel.StuSex),model.StuSex },
{nameof(RB_Student_ViewModel.StuBirth),model.StuBirth },
{nameof(RB_Student_ViewModel.ProviceId),model.ProviceId },
{nameof(RB_Student_ViewModel.CityId),model.CityId },
{nameof(RB_Student_ViewModel.AreaId),model.AreaId },
{nameof(RB_Student_ViewModel.Interest),model.Interest },
{nameof(RB_Student_ViewModel.JapanBaseInfo),model.JapanBaseInfo },
{nameof(RB_Student_ViewModel.StuProfession),model.StuProfession },
{nameof(RB_Student_ViewModel.StuEducation),model.StuEducation },
{nameof(RB_Student_ViewModel.StuPurpose),model.StuPurpose },
{nameof(RB_Student_ViewModel.StuSource),model.StuSource },
{nameof(RB_Student_ViewModel.StuAddress),model.StuAddress },
{nameof(RB_Student_ViewModel.StuContract),model.StuContract },
{nameof(RB_Student_ViewModel.StuContractMobile),model.StuContractMobile },
{nameof(RB_Student_ViewModel.StuIDCard),model.StuIDCard },
{nameof(RB_Student_ViewModel.StuIDCardAddress),model.StuIDCardAddress },
};
flag = base.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
}
else
{
var newId = base.Insert(model);
model.StuId = newId;
flag = newId > 0;
//创建学生账号
model.Account_Id = accountRepository.Insert(new Model.Entity.User.RB_Account()
{
Id = 0,
Account = model.StuTel,
AccountId = model.StuId,
AccountType = Common.Enum.User.AccountTypeEnum.Student,
AnnualLeaveDay = 0,
CreateBy = model.CreateBy,
CreateTime = DateTime.Now,
Group_Id = model.Group_Id,
School_Id = model.School_Id,
Status = DateStateEnum.Normal,
UpdateBy = model.UpdateBy,
UpdateTime = DateTime.Now,
Password = Common.DES.Encrypt(Common.Config.DefaultPwd)
});
}
return flag;
}
} }
} }
\ No newline at end of file
Edu.WebApi/Controllers/B2BApp/B2BAppController.cs 0 → 100644
View file @ 9d100207
using Edu.Common.API;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.Sell;
using Edu.Module.Course;
using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Edu.WebApi.Controllers.B2BApp
{
/// <summary>
/// 甲鹤同业小程序相关接口
/// </summary>
[Route("api/[controller]/[action]")]
[ApiExceptionFilter]
[ApiController]
[EnableCors("AllowCors")]
public class B2BAppController : BaseController
{
/// <summary>
/// 订单处理类对象
/// </summary>
private readonly OrderModule orderModule = new OrderModule();
/// <summary>
/// 同行获取学员订单分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCustomerGetStudentOrderPage()
{
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var customer = base.AppletCustomerInfo;
var query = new RB_Order_ViewModel()
{
Group_Id=customer.GroupId,
CustomerId=customer.CustomerId,
};
var list = orderModule.GetMyOrderPageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
}
}
Edu.WebApi/Controllers/User/UserController.cs
View file @ 9d100207
...@@ -647,7 +647,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -647,7 +647,6 @@ namespace Edu.WebApi.Controllers.User
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Student_ViewModel>(RequestParm.Msg.ToString()); var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Student_ViewModel>(RequestParm.Msg.ToString());
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
//query.School_Id = base.UserInfo.School_Id;
var list = studentModule.GetStudentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = studentModule.GetStudentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
{ {
......
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