包邮

Mall.Module.Product/OrderModule.cs

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