Commit 4e55214f authored by liudong1993's avatar liudong1993

包邮

parent 567511e9
...@@ -1643,6 +1643,7 @@ namespace Mall.Module.Product ...@@ -1643,6 +1643,7 @@ namespace Mall.Module.Product
} }
#region 处理全局包邮 #region 处理全局包邮
List<RB_FreeShipping_Extend> freeShippingList = new List<RB_FreeShipping_Extend>(); List<RB_FreeShipping_Extend> freeShippingList = new List<RB_FreeShipping_Extend>();
var SatisfiedGoodsListAll = new List<FreeShippingGoodsDetail>();
if (YFCategoryList.Any()) { if (YFCategoryList.Any()) {
YFCategoryList = YFCategoryList.Distinct().ToList(); YFCategoryList = YFCategoryList.Distinct().ToList();
string categoryIds = string.Join(",", YFCategoryList); string categoryIds = string.Join(",", YFCategoryList);
...@@ -1796,6 +1797,7 @@ namespace Mall.Module.Product ...@@ -1796,6 +1797,7 @@ namespace Mall.Module.Product
SatisfiedGoodsList.AddRange(SatisfiedGoodsList2); SatisfiedGoodsList.AddRange(SatisfiedGoodsList2);
} }
} }
SatisfiedGoodsListAll.AddRange(SatisfiedGoodsList2);
} }
//看着商品是否包含在这里面 //看着商品是否包含在这里面
...@@ -1804,6 +1806,11 @@ namespace Mall.Module.Product ...@@ -1804,6 +1806,11 @@ namespace Mall.Module.Product
FreeShippingDescription = SatisfiedGoodsList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationKey == item.SpecificationSort).FirstOrDefault().Name; FreeShippingDescription = SatisfiedGoodsList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationKey == item.SpecificationSort).FirstOrDefault().Name;
} }
} }
if (FreeShipping_Use == false) {
FreeShippingDescription = SatisfiedGoodsListAll.Where(x => x.GoodsId == item.GoodsId && x.SpecificationKey == item.SpecificationSort).FirstOrDefault()?.Name ?? "";
}
} }
} }
} }
......
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