Commit 960f6458 authored by 黄奎's avatar 黄奎

页面修改

parent 440cc985
...@@ -57,7 +57,6 @@ namespace Mall.Module.Product ...@@ -57,7 +57,6 @@ namespace Mall.Module.Product
{ nameof(RB_Groupbuy_Activity_Extend.Pieces),extModel.Pieces}, { nameof(RB_Groupbuy_Activity_Extend.Pieces),extModel.Pieces},
{ nameof(RB_Groupbuy_Activity_Extend.Forehead),extModel.Forehead}, { nameof(RB_Groupbuy_Activity_Extend.Forehead),extModel.Forehead},
{ nameof(RB_Groupbuy_Activity_Extend.Is_Area_Limit),extModel.Is_Area_Limit}, { nameof(RB_Groupbuy_Activity_Extend.Is_Area_Limit),extModel.Is_Area_Limit},
//{ nameof(RB_Groupbuy_Activity_Extend.Area_limit),extModel.Area_limit},
{ nameof(RB_Groupbuy_Activity_Extend.Is_quick_shop),extModel.Is_quick_shop}, { nameof(RB_Groupbuy_Activity_Extend.Is_quick_shop),extModel.Is_quick_shop},
{ nameof(RB_Groupbuy_Activity_Extend.Give_integral),extModel.Give_integral}, { nameof(RB_Groupbuy_Activity_Extend.Give_integral),extModel.Give_integral},
{ nameof(RB_Groupbuy_Activity_Extend.Give_integral_type),extModel.Give_integral_type}, { nameof(RB_Groupbuy_Activity_Extend.Give_integral_type),extModel.Give_integral_type},
...@@ -98,7 +97,7 @@ namespace Mall.Module.Product ...@@ -98,7 +97,7 @@ namespace Mall.Module.Product
/// <returns></returns> /// <returns></returns>
private bool SetGroupBuyAreaModule(RB_Groupbuy_Activity_Extend extModel) private bool SetGroupBuyAreaModule(RB_Groupbuy_Activity_Extend extModel)
{ {
bool flag = false; bool flag = true;
var alist = GetGroupBuyAreaModule(new RB_GroupBuy_Area_Extend() { GoodsId = extModel.GoodId, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId }); var alist = GetGroupBuyAreaModule(new RB_GroupBuy_Area_Extend() { GoodsId = extModel.GoodId, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
var insertList1 = extModel.AreaList.Where(x => !alist.Select(y => y.AreaId).Contains(x.AreaId)).ToList(); var insertList1 = extModel.AreaList.Where(x => !alist.Select(y => y.AreaId).Contains(x.AreaId)).ToList();
var deleteList1 = alist.Where(x => !extModel.AreaList.Select(y => y.AreaId).Contains(x.AreaId)).ToList(); var deleteList1 = alist.Where(x => !extModel.AreaList.Select(y => y.AreaId).Contains(x.AreaId)).ToList();
...@@ -120,7 +119,7 @@ namespace Mall.Module.Product ...@@ -120,7 +119,7 @@ namespace Mall.Module.Product
{ {
flag= groupbuy_AreaRepository.Delete(item.Id)>0; flag= groupbuy_AreaRepository.Delete(item.Id)>0;
} }
return false; return flag;
} }
/// <summary> /// <summary>
...@@ -237,7 +236,7 @@ namespace Mall.Module.Product ...@@ -237,7 +236,7 @@ namespace Mall.Module.Product
if (sv2list.Count() != supmodel.SpecificationValueList.Count() || sv2list.Count() != supmodel.SpecificationValueList.Where(x => x.Id > 0).Count()) if (sv2list.Count() != supmodel.SpecificationValueList.Count() || sv2list.Count() != supmodel.SpecificationValueList.Where(x => x.Id > 0).Count())
{ {
isChange = true; isChange = true;
groupbuy_Activity_SpecificationValueRepository.Delete(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.GoodsId), extModel.GoodId)); groupbuy_Activity_SpecificationValueRepository.DeleteBatch(sv2list);
foreach (var specValueItem in supmodel.SpecificationValueList) foreach (var specValueItem in supmodel.SpecificationValueList)
{ {
flag = groupbuy_Activity_SpecificationValueRepository.Insert(new RB_Groupbuy_Activity_Specificationvalue_Extend() flag = groupbuy_Activity_SpecificationValueRepository.Insert(new RB_Groupbuy_Activity_Specificationvalue_Extend()
...@@ -264,7 +263,7 @@ namespace Mall.Module.Product ...@@ -264,7 +263,7 @@ namespace Mall.Module.Product
{ {
{ nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Image),supModel1.Image}, { nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Image),supModel1.Image},
{ nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Name),supModel1.Name}, { nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Name),supModel1.Name},
{ nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Sort),supModel1.Sort} { nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Sort),supModel1.Sort},
}; };
flag = groupbuy_Activity_SpecificationValueRepository.Update(specValueFileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Id), qitem.Id)); flag = groupbuy_Activity_SpecificationValueRepository.Update(specValueFileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationvalue_Extend.Id), qitem.Id));
} }
...@@ -277,7 +276,7 @@ namespace Mall.Module.Product ...@@ -277,7 +276,7 @@ namespace Mall.Module.Product
{ {
isChange = true; isChange = true;
//删除规格价格 //删除规格价格
groupbuy_Activity_SpecificationPriceRepository.DeleteOne(new WhereHelper(nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId), extModel.GoodId)); groupbuy_Activity_SpecificationPriceRepository.DeleteBatch(specPricelist);
foreach (var priceItem in extModel.SpecificationPriceList) foreach (var priceItem in extModel.SpecificationPriceList)
{ {
var priceModel = new RB_Groupbuy_Activity_Specificationprice_Extend() var priceModel = new RB_Groupbuy_Activity_Specificationprice_Extend()
......
...@@ -281,8 +281,6 @@ namespace Mall.Module.Product ...@@ -281,8 +281,6 @@ namespace Mall.Module.Product
GoodsId = extModel.GoodId, GoodsId = extModel.GoodId,
}); });
if (groupStepList != null && groupStepList.Count > 0) if (groupStepList != null && groupStepList.Count > 0)
{ {
foreach (var item in groupStepList) foreach (var item in groupStepList)
...@@ -379,7 +377,7 @@ namespace Mall.Module.Product ...@@ -379,7 +377,7 @@ namespace Mall.Module.Product
extModel.FormsName = "默认表单"; extModel.FormsName = "默认表单";
} }
extModel.SpecificationList = specificationList; extModel.SpecificationList = specificationList;
extModel.SpecificationPriceList = specPriceList; extModel.SpecificationPriceList = specPriceList.OrderBy(qitem=>qitem.SortNum).ToList();
extModel.GroupList = groupStepList; extModel.GroupList = groupStepList;
} }
return extModel; return extModel;
......
...@@ -41,7 +41,7 @@ namespace Mall.Repository.Product ...@@ -41,7 +41,7 @@ namespace Mall.Repository.Product
{ {
where += $@" and {nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId)} in({dmodel.GoodsIds})"; where += $@" and {nameof(RB_Groupbuy_Activity_Specificationprice_Extend.GoodsId)} in({dmodel.GoodsIds})";
} }
string sql = $@"select * from rb_groupbuy_activity_specificationprice where {where} order by Id desc"; string sql = $@"select * from rb_groupbuy_activity_specificationprice where {where} ";
return Get<RB_Groupbuy_Activity_Specificationprice_Extend>(sql).ToList(); return Get<RB_Groupbuy_Activity_Specificationprice_Extend>(sql).ToList();
} }
} }
......
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