Commit fd4ccea0 authored by 黄奎's avatar 黄奎

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

parents 906983db c95042c3
...@@ -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,6 +2061,8 @@ namespace Edu.Module.Course ...@@ -2061,6 +2061,8 @@ namespace Edu.Module.Course
{ {
bool flag = false; bool flag = false;
if (courseModel.MallGoodsId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Goods.SellingPrice),courseModel.SellPrice }, {nameof(RB_Goods.SellingPrice),courseModel.SellPrice },
...@@ -2095,6 +2097,14 @@ namespace Edu.Module.Course ...@@ -2095,6 +2097,14 @@ namespace Edu.Module.Course
goodsPreferentialLsit.Add(goodsPreferential); goodsPreferentialLsit.Add(goodsPreferential);
} }
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()) if (oldList == null || !oldList.Any())
{ {
foreach (var item in goodsPreferentialLsit) foreach (var item in goodsPreferentialLsit)
...@@ -2139,6 +2149,7 @@ namespace Edu.Module.Course ...@@ -2139,6 +2149,7 @@ namespace Edu.Module.Course
} }
} }
} }
}
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