Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 906983db c95042c3
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 57 deletions
Edu.Module.Course/CourseModule.cs
View file @ fd4ccea0
...@@ -1737,7 +1737,7 @@ namespace Edu.Module.Course ...@@ -1737,7 +1737,7 @@ namespace Edu.Module.Course
GoodsNumbers = item.ClassNo, GoodsNumbers = item.ClassNo,
GoodsWeight = 0, GoodsWeight = 0,
InventoryNum = item.ClassPersion - item.OrderStudentCount,//暂 InventoryNum = item.ClassPersion - item.OrderStudentCount,//暂
SellingPrice = item.SellPrice, SellingPrice = model.SellPrice,
SpecificationSort = Sort.ToString(),//暂定 SpecificationSort = Sort.ToString(),//暂定
AttrList = new object() AttrList = new object()
}; };
...@@ -2061,85 +2061,96 @@ namespace Edu.Module.Course ...@@ -2061,85 +2061,96 @@ namespace Edu.Module.Course
{ {
bool flag = false; bool flag = false;
Dictionary<string, object> fileds = new Dictionary<string, object>() if (courseModel.MallGoodsId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Goods.SellingPrice),courseModel.SellPrice }, {nameof(RB_Goods.SellingPrice),courseModel.SellPrice },
{nameof(RB_Goods.OriginalPrice),courseModel.OriginalPrice }, {nameof(RB_Goods.OriginalPrice),courseModel.OriginalPrice },
}; };
flag = mallGoodsRepository.Update(fileds, new WhereHelper(nameof(RB_Goods.Id), courseModel.MallGoodsId)); flag = mallGoodsRepository.Update(fileds, new WhereHelper(nameof(RB_Goods.Id), courseModel.MallGoodsId));
var oldList = MallGoodsPreferentialRepository.GetGoodsPreferentialListRepostory(new RB_Goods_Preferential_Extend() { GoodsId = courseModel.MallGoodsId }); var oldList = MallGoodsPreferentialRepository.GetGoodsPreferentialListRepostory(new RB_Goods_Preferential_Extend() { GoodsId = courseModel.MallGoodsId });
List<RB_Goods_Preferential_Extend> goodsPreferentialLsit = new List<RB_Goods_Preferential_Extend>(); List<RB_Goods_Preferential_Extend> goodsPreferentialLsit = new List<RB_Goods_Preferential_Extend>();
foreach (var item in list) foreach (var item in list)
{
RB_Goods_Preferential_Extend goodsPreferential = new RB_Goods_Preferential_Extend()
{ {
Id = 0, RB_Goods_Preferential_Extend goodsPreferential = new RB_Goods_Preferential_Extend()
GoodsId = courseModel.MallGoodsId, {
PreferentialTerms = item.PreferentialTerms, Id = 0,
SaleCommissionType = item.SaleCommissionType, GoodsId = courseModel.MallGoodsId,
SaleCommissionMoney = item.SaleCommissionMoney, PreferentialTerms = item.PreferentialTerms,
B2BCommissionType = item.B2BCommissionType, SaleCommissionType = item.SaleCommissionType,
B2BCommissionMoney = item.B2BCommissionMoney, SaleCommissionMoney = item.SaleCommissionMoney,
PriceDiscountType = item.PriceDiscountType, B2BCommissionType = item.B2BCommissionType,
BuyNum = item.BuyNum, B2BCommissionMoney = item.B2BCommissionMoney,
SendNum = item.SendNum, PriceDiscountType = item.PriceDiscountType,
PriceType = item.PriceType, BuyNum = item.BuyNum,
PriceMoney = item.PriceMoney, SendNum = item.SendNum,
TenantId = Convert.ToInt32(Config.JHTenantId), PriceType = item.PriceType,
MallBaseId = Convert.ToInt32(Config.JHMallBaseId), PriceMoney = item.PriceMoney,
Status = 0, TenantId = Convert.ToInt32(Config.JHTenantId),
EduCommissionType = item.EduCommissionType, MallBaseId = Convert.ToInt32(Config.JHMallBaseId),
EduCommissionMoney = item.EduCommissionMoney Status = 0,
}; EduCommissionType = item.EduCommissionType,
goodsPreferentialLsit.Add(goodsPreferential); EduCommissionMoney = item.EduCommissionMoney
} };
goodsPreferentialLsit.Add(goodsPreferential);
}
if (oldList == null || !oldList.Any())
{
foreach (var item in goodsPreferentialLsit)
{
flag = MallGoodsPreferentialRepository.Insert(item) > 0; var splist = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsId = courseModel.MallGoodsId, TenantId = Convert.ToInt32(Config.JHTenantId), MallBaseId = Convert.ToInt32(Config.JHMallBaseId) });
if (splist != null && splist.Any())
{
splist.ForEach(x => x.SellingPrice = courseModel.SellPrice);
goods_SpecificationPriceRepository.UpdateBatch(splist);
} }
} if (oldList == null || !oldList.Any())
//原来有优惠数据
else
{
if (list == null || (list != null && list.Count == 0))
{ {
flag = MallGoodsPreferentialRepository.DeleteGoodsPreferentialRepostory(courseModel.MallGoodsId); foreach (var item in goodsPreferentialLsit)
{
flag = MallGoodsPreferentialRepository.Insert(item) > 0;
}
} }
//原来有优惠数据
else else
{ {
//找出差异的数据 if (list == null || (list != null && list.Count == 0))
var deleteList = oldList.Where(qitem => !goodsPreferentialLsit.Any(oldItem => qitem.PriceDiscountType == oldItem.PriceDiscountType)).ToList();
foreach (var dItem in deleteList)
{ {
if (dItem.Id > 0) flag = MallGoodsPreferentialRepository.DeleteGoodsPreferentialRepostory(courseModel.MallGoodsId);
{
flag = MallGoodsPreferentialRepository.Delete(dItem.Id) > 0;
}
} }
foreach (var priceItem in goodsPreferentialLsit) else
{ {
var nowItem = oldList.Where(x => x.PriceDiscountType == priceItem.PriceDiscountType).FirstOrDefault(); //找出差异的数据
if (nowItem != null && nowItem.Id > 0) var deleteList = oldList.Where(qitem => !goodsPreferentialLsit.Any(oldItem => qitem.PriceDiscountType == oldItem.PriceDiscountType)).ToList();
foreach (var dItem in deleteList)
{ {
priceItem.Id = nowItem.Id; if (dItem.Id > 0)
{
flag = MallGoodsPreferentialRepository.Delete(dItem.Id) > 0;
}
} }
if (priceItem.Id == 0) foreach (var priceItem in goodsPreferentialLsit)
{ {
flag = MallGoodsPreferentialRepository.Insert(priceItem) > 0; var nowItem = oldList.Where(x => x.PriceDiscountType == priceItem.PriceDiscountType).FirstOrDefault();
} if (nowItem != null && nowItem.Id > 0)
else {
{ priceItem.Id = nowItem.Id;
flag = MallGoodsPreferentialRepository.Update(priceItem); }
if (priceItem.Id == 0)
{
flag = MallGoodsPreferentialRepository.Insert(priceItem) > 0;
}
else
{
flag = MallGoodsPreferentialRepository.Update(priceItem);
}
} }
} }
} }
} }
return flag; return flag;
} }
......
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