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

Mall.Module.Product/OrderModule.cs

@@ -333,14 +333,23 @@ namespace Mall.Module.Product
                     {
                         var nowcategory = categoryList.Where(x => x.GoodsId == item.GoodsId).Select(x => x.CategoryId);
 
-                        var fullNumPinkageModel = freeShippingList.Where(x => nowcategory.Contains(x.CategoryId) && x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
+                        var fullNumPinkageModel = freeShippingList.Where(x => nowcategory.Contains(x.CategoryId) && x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0 && x.CategoryId > 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
                         if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
                         {
-                            fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
+                            fullNumPinkageModel = freeShippingList.Where(x => nowcategory.Contains(x.CategoryId) && x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0 && x.CategoryId > 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
+                        }
+                        if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                        {
+                            fullNumPinkageModel = freeShippingList.Where(x => nowcategory.Contains(x.CategoryId) && x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0 && x.CategoryId == 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
+                        }
+                        if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                        {
+                            fullNumPinkageModel = freeShippingList.Where(x => nowcategory.Contains(x.CategoryId) && x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0 && x.CategoryId == 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
                         }
                         item.FreeShippingModel = (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0) ? new RB_FreeShipping_Extend() : fullNumPinkageModel;
                     }
-                    else {
+                    else
+                    {
                         item.FreeShippingModel = new RB_FreeShipping_Extend();
                     }
 
@@ -4157,7 +4166,7 @@ namespace Mall.Module.Product
                         {
                             var supplierModel = supplist.Where(x => x.ID == item.SupplierId).FirstOrDefault();
                             var qscList = scList.Where(x => x.SupplierId == item.SupplierId).ToList();
-                            if (item.CostMoney > 0 && ((item.Final_Price ?? 0) - (item.CostMoney ?? 0) * (item.Number ?? 0) - item.TCommissionMoney)>0 && qscList.Any()) 
+                            if (item.CostMoney > 0 && ((item.Final_Price ?? 0) - (item.CostMoney ?? 0) * (item.Number ?? 0) - item.TCommissionMoney) > 0 && qscList.Any())
                             {
                                 decimal Profit = (item.Final_Price ?? 0) - (item.CostMoney ?? 0) * (item.Number ?? 0) - item.TCommissionMoney;
                                 decimal GrossMargin = Math.Round(Profit / (item.Final_Price ?? 0), 2, MidpointRounding.AwayFromZero);

Mall.Module.Product/ProductModule.cs

@@ -1059,10 +1059,18 @@ namespace Mall.Module.Product
                 var freeShippingList = freeShippingRepository.GetFreeShippingListByCategoryIds(new RB_FreeShipping_Extend { MallBaseId = model.MallBaseId, TenantId = model.TenantId, CategoryIds = categoryIds });
                 if (freeShippingList != null && freeShippingList.Any())
                 {
-                    var fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
+                    var fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0 && x.CategoryId > 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
                     if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
                     {
-                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
+                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0 && x.CategoryId > 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
+                    }
+                    if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                    {
+                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0 && x.CategoryId == 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
+                    }
+                    if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                    {
+                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0 && x.CategoryId == 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
                     }
                     model.FreeShippingModel = (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0) ? new RB_FreeShipping_Extend() : fullNumPinkageModel;
                 }

Mall.Repository/BaseSetUp/RB_FreeShippingRepository.cs

@@ -101,6 +101,7 @@ INNER JOIN rb_mallbase as c on a.MallBaseId = c.ID and a.TenantId = c.TenantId W
                 }
                 if (!string.IsNullOrWhiteSpace(query.CategoryIds))
                 {
+                    query.CategoryIds += query.CategoryIds + ",0";
                     builder.Append($" AND b.{nameof(RB_FreeShippingCategory_Extend.CategoryId)} in({query.CategoryIds})");
                 }
             }