Commit a30271f4 authored by 黄奎's avatar 黄奎

活动保存修改

parent 957cbf4d
......@@ -358,8 +358,8 @@ namespace Mall.Module.Product
{
SName = smodel.Name,
SId = smodel.Id,
SVId = svmodel.Sort,
SVName = svmodel.Name
SVId = svmodel?.Sort??0,
SVName = svmodel?.Name??"",
});
}
}
......@@ -461,11 +461,11 @@ namespace Mall.Module.Product
{
isChange = true;
//删除规格
groupbuy_Activity_SpecificationRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Specification_Extend.GoodsId), extModel.GoodId));
groupbuy_Activity_SpecificationRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Specification_Extend.GoodsId), extModel.GoodId));
//删除规格值
groupbuy_Activity_SpecificationValueRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.GoodsId), extModel.GoodId));
groupbuy_Activity_SpecificationValueRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.GoodsId), extModel.GoodId));
//删除规格价格
groupbuy_Activity_SpecificationPriceRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId), extModel.GoodId));
groupbuy_Activity_SpecificationPriceRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId), extModel.GoodId));
//新增规格和规格值
foreach (var specItem in extModel.SpecificationList)
......@@ -614,7 +614,7 @@ namespace Mall.Module.Product
{
isChange = true;
//删除规格价格
groupbuy_Activity_SpecificationPriceRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId), extModel.GoodId));
groupbuy_Activity_SpecificationPriceRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId), extModel.GoodId));
foreach (var priceItem in extModel.SpecificationPriceList)
{
var priceModel = new RB_Groupbuy_Activity_Specificationprice_Extend()
......@@ -684,10 +684,10 @@ namespace Mall.Module.Product
var stepList = stepRepository.GetGroupBuyActivityListRepository(new RB_Groupbuy_Activity_Step_Extend() { GoodId = extModel.GoodId, MallBaseId = extModel.MallBaseId, TenantId = extModel.TenantId });
if (isChange || (stepList.Count() != extModel.GroupList.Count() || stepList.Count() != extModel.GroupList.Where(qitem => qitem.StepId > 0).Count()))
{
stepRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Step_Extend.GoodId), extModel.GoodId));
groupbuy_Activity_Step_PriceRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Step_Price_Extend.GoodId), extModel.GoodId));
groupBuy_DistributioncommissionRepository.Delete(new WhereHelper(nameof(RB_GroupBuy_Distributioncommission_Extend.GoodsId), extModel.GoodId));
groupbuy_MemberpriceRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Memberprice_Extend.GoodsId), extModel.GoodId));
stepRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Step_Extend.GoodId), extModel.GoodId));
groupbuy_Activity_Step_PriceRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Step_Price_Extend.GoodId), extModel.GoodId));
groupBuy_DistributioncommissionRepository.DeleteOne(new WhereHelper(nameof(RB_GroupBuy_Distributioncommission_Extend.GoodsId), extModel.GoodId));
groupbuy_MemberpriceRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Memberprice_Extend.GoodsId), extModel.GoodId));
foreach (var groupItem in extModel.GroupList)
{
var groupModel = new RB_Groupbuy_Activity_Step_Extend()
......@@ -796,7 +796,7 @@ namespace Mall.Module.Product
{ nameof(RB_Groupbuy_Activity_Step_Price_Extend.PinTuanStock),subItem.PinTuanStock},
{ nameof(RB_Groupbuy_Activity_Step_Price_Extend.SortNum),subItem.SortNum},
};
flag = groupbuy_Activity_Step_PriceRepository.Update(stepPriceFileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Step_Price_Extend),subItem.Id));
flag = groupbuy_Activity_Step_PriceRepository.Update(stepPriceFileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Step_Price_Extend.Id), subPriceModel.Id));
}
//更新会员价
......@@ -805,17 +805,32 @@ namespace Mall.Module.Product
foreach (var childItem in subItem.GradeMemberPriceList)
{
var memberPriceModel = memberPriceList.Where(qitem => qitem.StepId == item.StepId && qitem.SpecificationSort == subItem.SpecificationSort).FirstOrDefault();
if (memberPriceModel != null)
{
Dictionary<string, object> memberPriceFileds = new Dictionary<string, object>()
{
{ nameof(RB_Groupbuy_Memberprice_Extend.MemberGrade),childItem.MemberGrade},
{ nameof(RB_Groupbuy_Memberprice_Extend.MemberPrice),childItem.MemberPrice},
};
flag = groupbuy_MemberpriceRepository.Update(memberPriceFileds, new WhereHelper(nameof(RB_Groupbuy_Memberprice_Extend), childItem.Id));
flag = groupbuy_MemberpriceRepository.Update(memberPriceFileds, new WhereHelper(nameof(RB_Groupbuy_Memberprice_Extend.Id), memberPriceModel.Id));
}
else
{
childItem.SpecificationSort = subItem.SpecificationSort;
childItem.GoodsId = extModel.GoodId;
childItem.Status = 0;
childItem.TenantId = extModel.TenantId;
childItem.MallBaseId = extModel.MallBaseId;
childItem.StepId = item.StepId;
childItem.CreateDate = DateTime.Now;
childItem.UpdateDate = DateTime.Now;
flag = groupbuy_MemberpriceRepository.Insert(childItem) > 0;
}
}
}
if (oldSeparateDistributionType !=extModel.SeparateDistributionType)
{
groupbuy_MemberpriceRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Memberprice_Extend.GoodsId), extModel.GoodId));
groupbuy_MemberpriceRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Memberprice_Extend.GoodsId), extModel.GoodId));
//设置分销佣金
SetDistributioncommissionModule(extModel, stepModel, item.StepId, isCreate: true);
}
......
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