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

Mall.Module.Product/OrderModule.cs

@@ -2689,6 +2689,11 @@ namespace Mall.Module.Product
                                     }
                                 }
                             }
+
+                            if (dcList.Where(x => x.SmallShopId > 0).Any())
+                            {
+                                IsCommissionCoupons = false;
+                            }
                         }
                     }
                 }

Mall.Module.Product/ProductModule.cs

@@ -1489,6 +1489,11 @@ namespace Mall.Module.Product
                 }
                 MaxSellMoney = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0);
                 model.SellingPrice = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
+                decimal MaxPrice = MaxSellMoney + Math.Ceiling(MaxSellMoney / 10);
+                if (MaxPrice > model.OriginalPrice)
+                {
+                    model.OriginalPrice = MaxPrice;
+                }
             }
             //区域
             model.AreaList = new List<RB_Goods_Area_Extend>();