Skip to content

M
mall.oytour.com
Commit 4fce5f7f authored by liudong1993's avatar liudong1993
Browse files
Options

教育订单取消

parent fedbd32b
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 3 deletions
Mall.Module.Product/OrderModule.cs
View file @ 4fce5f7f
...@@ -12,6 +12,7 @@ using Mall.Common.Plugin; ...@@ -12,6 +12,7 @@ using Mall.Common.Plugin;
using Mall.Model.Entity.Finance; using Mall.Model.Entity.Finance;
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Extend.BaseSetUp; using Mall.Model.Extend.BaseSetUp;
using Mall.Model.Extend.Education;
using Mall.Model.Extend.Finance; using Mall.Model.Extend.Finance;
using Mall.Model.Extend.GuideCar; using Mall.Model.Extend.GuideCar;
using Mall.Model.Extend.Product; using Mall.Model.Extend.Product;
...@@ -6449,6 +6450,42 @@ namespace Mall.Module.Product ...@@ -6449,6 +6450,42 @@ namespace Mall.Module.Product
} }
//余额支付回滚 //余额支付回滚
if (omodel.OrderClassify == 2 && omodel.EducationMoney > 0)
{
var uclist = education_MemberUseCouponRepository.GetList(new Model.Entity.Education.RB_Education_MemberUseCoupon() { OrderId = omodel.OrderId });
var ucModel = uclist.FirstOrDefault();
if (ucModel != null)
{
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(Model.Entity.Education.RB_Education_MemberUseCoupon.Status),1}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(Model.Entity.Education.RB_Education_MemberUseCoupon.Id),
FiledValue=ucModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberUseCouponRepository.Update(keyValues1, wheres1, trans);
var educationModel = education_MemberCouponRepository.GetEntity(ucModel.MemberCouponId ?? 0);
if (educationModel != null)
{
//更新用户课程卡 已使用数量
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Education_MemberCoupon_Extend.UseHeXiao),educationModel.UseHeXiao - ucModel.UseHeXiao}
};
List<WhereHelper> wheres2 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_MemberCoupon_Extend.Id),
FiledValue=educationModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberCouponRepository.Update(keyValues2, wheres2, trans);
}
}
}
} }
Task.Run(() => goods_LogRepository.Insert(new RB_Goods_Log() Task.Run(() => goods_LogRepository.Insert(new RB_Goods_Log()
{ {
...@@ -9450,6 +9487,42 @@ namespace Mall.Module.Product ...@@ -9450,6 +9487,42 @@ namespace Mall.Module.Product
}); });
} }
} }
if (omodel.OrderClassify == 2 && omodel.EducationMoney > 0)
{
var uclist = education_MemberUseCouponRepository.GetList(new Model.Entity.Education.RB_Education_MemberUseCoupon() { OrderId = omodel.OrderId });
var ucModel = uclist.FirstOrDefault();
if (ucModel != null) {
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(Model.Entity.Education.RB_Education_MemberUseCoupon.Status),1}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(Model.Entity.Education.RB_Education_MemberUseCoupon.Id),
FiledValue=ucModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberUseCouponRepository.Update(keyValues1, wheres1, trans);
var educationModel = education_MemberCouponRepository.GetEntity(ucModel.MemberCouponId ?? 0);
if (educationModel != null)
{
//更新用户课程卡 已使用数量
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Education_MemberCoupon_Extend.UseHeXiao),educationModel.UseHeXiao - ucModel.UseHeXiao}
};
List<WhereHelper> wheres2 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_MemberCoupon_Extend.Id),
FiledValue=educationModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberCouponRepository.Update(keyValues2, wheres2, trans);
}
}
}
} }
goods_OrderRepository.DBSession.Commit(); goods_OrderRepository.DBSession.Commit();
if (flag && tenantId == 1 && omodel.OrderSource == UserSourceEnum.ERP) if (flag && tenantId == 1 && omodel.OrderSource == UserSourceEnum.ERP)
......
Mall.Module.Product/OrderModule_Part.cs
View file @ 4fce5f7f
...@@ -1472,7 +1472,22 @@ namespace Mall.Module.Product ...@@ -1472,7 +1472,22 @@ namespace Mall.Module.Product
UseDate = DateTime.Now, UseDate = DateTime.Now,
UserId = demodel.UserId, UserId = demodel.UserId,
UseHeXiao = EducationNum UseHeXiao = EducationNum
}); }, trans);
var educationModel = eList.FirstOrDefault();
if (educationModel != null) {
//更新用户课程卡 已使用数量
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Education_MemberCoupon_Extend.UseHeXiao),educationModel.UseHeXiao + EducationNum}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_MemberCoupon_Extend.Id),
FiledValue=educationModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberCouponRepository.Update(keyValues1, wheres1, trans);
}
} }
#endregion #endregion
......
Mall.Repository/Education/RB_Education_MemberUseCouponRepository.cs
View file @ 4fce5f7f
...@@ -40,9 +40,13 @@ namespace Mall.Repository.Education ...@@ -40,9 +40,13 @@ namespace Mall.Repository.Education
{ {
builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.MemberCouponId)}={query.MemberCouponId}"); builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.MemberCouponId)}={query.MemberCouponId}");
} }
if (query.OrderId > 0)
{
builder.Append($" AND a.{nameof(RB_Education_MemberUseCoupon.OrderId)}={query.OrderId}");
}
} }
string sql = @$" select * FROM {TableName} AS a where 1=1 {builder.ToString()} "; string sql = @$" select * FROM {TableName} AS a where 1=1 and a.Status=0 {builder.ToString()} ";
return Get<RB_Education_MemberUseCoupon>(sql).ToList(); return Get<RB_Education_MemberUseCoupon>(sql).ToList();
} }
} }
......
Mall.WindowsService/Module/FinanceModule.cs
View file @ 4fce5f7f
...@@ -8,12 +8,14 @@ using Mall.Model.Entity.BaseSetUp; ...@@ -8,12 +8,14 @@ using Mall.Model.Entity.BaseSetUp;
using Mall.Model.Entity.Finance; using Mall.Model.Entity.Finance;
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Entity.User; using Mall.Model.Entity.User;
using Mall.Model.Extend.Education;
using Mall.Model.Extend.Finance; using Mall.Model.Extend.Finance;
using Mall.Model.Extend.Product; using Mall.Model.Extend.Product;
using Mall.Model.Extend.User; using Mall.Model.Extend.User;
using Mall.Module.User; using Mall.Module.User;
using Mall.Repository; using Mall.Repository;
using Mall.Repository.BaseSetUp; using Mall.Repository.BaseSetUp;
using Mall.Repository.Education;
using Mall.Repository.Finance; using Mall.Repository.Finance;
using Mall.Repository.Product; using Mall.Repository.Product;
using Mall.Repository.User; using Mall.Repository.User;
...@@ -139,6 +141,15 @@ namespace Mall.WindowsService.Module ...@@ -139,6 +141,15 @@ namespace Mall.WindowsService.Module
/// 商品可预定日期 /// 商品可预定日期
/// </summary> /// </summary>
private static readonly RB_Goods_TargetDateRepository goods_TargetDateRepository = new RB_Goods_TargetDateRepository(); private static readonly RB_Goods_TargetDateRepository goods_TargetDateRepository = new RB_Goods_TargetDateRepository();
/// <summary>
/// 用户课程卡
/// </summary>
private static readonly RB_Education_MemberCouponRepository education_MemberCouponRepository = new RB_Education_MemberCouponRepository();
/// <summary>
/// 课程卡使用
/// </summary>
private static readonly RB_Education_MemberUseCouponRepository education_MemberUseCouponRepository = new RB_Education_MemberUseCouponRepository();
#region 收入 #region 收入
...@@ -676,6 +687,43 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A ...@@ -676,6 +687,43 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
} }
//余额支付回滚 //余额支付回滚
if (qitem.OrderClassify == 2 && qitem.EducationMoney > 0)
{
var uclist = education_MemberUseCouponRepository.GetList(new Model.Entity.Education.RB_Education_MemberUseCoupon() { OrderId = qitem.OrderId });
var ucModel = uclist.FirstOrDefault();
if (ucModel != null)
{
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(Model.Entity.Education.RB_Education_MemberUseCoupon.Status),1}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(Model.Entity.Education.RB_Education_MemberUseCoupon.Id),
FiledValue=ucModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberUseCouponRepository.Update(keyValues1, wheres1);
var educationModel = education_MemberCouponRepository.GetEntity(ucModel.MemberCouponId ?? 0);
if (educationModel != null)
{
//更新用户课程卡 已使用数量
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Education_MemberCoupon_Extend.UseHeXiao),educationModel.UseHeXiao - ucModel.UseHeXiao}
};
List<WhereHelper> wheres2 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_MemberCoupon_Extend.Id),
FiledValue=educationModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
education_MemberCouponRepository.Update(keyValues2, wheres2);
}
}
}
} }
goods_LogRepository.Insert(new Mall.Model.Entity.Product.RB_Goods_Log() goods_LogRepository.Insert(new Mall.Model.Entity.Product.RB_Goods_Log()
{ {
......
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