Commit 0a9b8f20 authored by 黄奎's avatar 黄奎

页面下修改

parent 9e1e2af2
...@@ -1646,8 +1646,12 @@ namespace Mall.Module.Product ...@@ -1646,8 +1646,12 @@ namespace Mall.Module.Product
} }
} }
} }
MaxSellMoney = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0);
model.SellingPrice = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0); if (model.SpecificationPriceList != null && model.SpecificationPriceList.Count > 0)
{
MaxSellMoney = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0);
model.SellingPrice = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
}
decimal MaxPrice = MaxSellMoney + Math.Ceiling(MaxSellMoney / 10); decimal MaxPrice = MaxSellMoney + Math.Ceiling(MaxSellMoney / 10);
if (MaxPrice > model.OriginalPrice) if (MaxPrice > model.OriginalPrice)
{ {
...@@ -2461,9 +2465,6 @@ namespace Mall.Module.Product ...@@ -2461,9 +2465,6 @@ namespace Mall.Module.Product
} }
} }
List<RB_Goods_Preferential_Extend> goodsPreferentialList = new List<RB_Goods_Preferential_Extend>(); List<RB_Goods_Preferential_Extend> goodsPreferentialList = new List<RB_Goods_Preferential_Extend>();
goodsPreferentialList = RB_Goods_PreferentialRepository.GetGoodsPreferentialListRepostory(new RB_Goods_Preferential_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, GoodsId = model.Id }); goodsPreferentialList = RB_Goods_PreferentialRepository.GetGoodsPreferentialListRepostory(new RB_Goods_Preferential_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, GoodsId = model.Id });
...@@ -2479,9 +2480,9 @@ namespace Mall.Module.Product ...@@ -2479,9 +2480,9 @@ namespace Mall.Module.Product
categoryIdList = model?.CategoryList?.Select(x => x.CategoryId ?? 0).ToList(), categoryIdList = model?.CategoryList?.Select(x => x.CategoryId ?? 0).ToList(),
status = model.GoodsStatus, status = model.GoodsStatus,
isAllowShare = IsAllowShare,//是否可以分享 isAllowShare = IsAllowShare,//是否可以分享
advertising = model.Advertising,//广告词 advertising = model?.Advertising??"",//广告词
price = model.SellingPrice, price = model.SellingPrice,
sendArea = model.SendArea, sendArea = model?.SendArea??"",
use_attr = model.IsCustomSpecification, use_attr = model.IsCustomSpecification,
attr_groups = model.SpecificationList.Select(x => new attr_groups = model.SpecificationList.Select(x => new
{ {
...@@ -2511,8 +2512,8 @@ namespace Mall.Module.Product ...@@ -2511,8 +2512,8 @@ namespace Mall.Module.Product
is_level_alone = model.SeparateSetMember,//是否单独设置会员价 is_level_alone = model.SeparateSetMember,//是否单独设置会员价
share_type = model.SeparateDistributionMoneyType,//分销佣金类型 share_type = model.SeparateDistributionMoneyType,//分销佣金类型
//sign = "", //sign = "",
app_share_pic = model.CustomShareImagePath, app_share_pic = model?.CustomShareImagePath??"",
app_share_title = model.CustomShareTitles, app_share_title = model?.CustomShareTitles??"",
is_default_services = model.IsDefaultService, is_default_services = model.IsDefaultService,
sort = model.Sort, sort = model.Sort,
created_at = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", created_at = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
...@@ -2533,12 +2534,12 @@ namespace Mall.Module.Product ...@@ -2533,12 +2534,12 @@ namespace Mall.Module.Product
form_id = model.FormsId, form_id = model.FormsId,
sales = (model.SalesNum ?? 0) + payment_num,//已售出数量 + 订单商品数量// sales = (model.SalesNum ?? 0) + payment_num,//已售出数量 + 订单商品数量//
name = model.Name, name = model.Name,
subname = model.SubName, subname = model?.SubName??"",
original_price = model.OriginalPrice, original_price = model.OriginalPrice,
cover_pic = model.CoverImage, cover_pic = model.CoverImage,
unit = model.Unit, unit = model.Unit,
detail = model.GoodsDetails, detail = model.GoodsDetails,
video_url = model.VideoAddress, video_url = model?.VideoAddress??"",
level_show = (userModel?.MemberGrade ?? 0) > 0 ? 1 : 2,//是否显示会员价 level_show = (userModel?.MemberGrade ?? 0) > 0 ? 1 : 2,//是否显示会员价
is_sales = model.GoodsStatus == 1 && model.InventoryNum > 0 ? 1 : 2,//是否可购买 is_sales = model.GoodsStatus == 1 && model.InventoryNum > 0 ? 1 : 2,//是否可购买
attr = priceList, attr = priceList,
...@@ -2597,10 +2598,10 @@ namespace Mall.Module.Product ...@@ -2597,10 +2598,10 @@ namespace Mall.Module.Product
is_quick_shop = model.IsQuickBuy, is_quick_shop = model.IsQuickBuy,
is_sell_well = model.IsSellWell, is_sell_well = model.IsSellWell,
is_negotiable = model.IsGoodsNegotiable, is_negotiable = model.IsGoodsNegotiable,
freeShippingName = model.FreeShippingModel.Name, freeShippingName = model.FreeShippingModel?.Name??"",
fullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage ?? 0, fullMoneyPinkage = model.FreeShippingModel?.FullMoneyPinkage ?? 0,
fullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0, fullNumPinkage = model?.FreeShippingModel?.FullNumPinkage ?? 0,
freeShippingUrl = model.FreeShippingModel.FreeShippingUrl, freeShippingUrl = model?.FreeShippingModel?.FreeShippingUrl,
marketingLogo = JsonHelper.Serialize(tempLogo), marketingLogo = JsonHelper.Serialize(tempLogo),
//分类 //分类
cats = model.CategoryList.Select(x => new cats = model.CategoryList.Select(x => new
......
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