Commit 6df8e2a8 authored by liudong1993's avatar liudong1993

1

parent 88ab3ade
......@@ -108,7 +108,7 @@ namespace Mall.Model.Entity.Product
set;
}
/// <summary>
/// 最终价格
/// 最终价格(不包含运费)
/// </summary>
public decimal? Final_Price
{
......
......@@ -2198,7 +2198,7 @@ namespace Mall.Module.Product
item.InventoryNum = gmodel.InventoryNum ?? 0;
item.CostMoney = gmodel.CostPrice ?? 0;
item.ProductCode = gmodel.GoodsNumbers;
item.CategoryIdList = clist.Where(x => x.GoodsId == item.Id).Select(x => x.CategoryId ?? 0).ToList();
item.CategoryIdList = categoryList.Select(x => x.CategoryId ?? 0).ToList();
int GoodsWeight = gmodel.GoodsWeight ?? 0;//商品重量
#region 规格
//验证规格是否已失效
......
......@@ -83,7 +83,7 @@ where {where} group by h.Id order by h.Id desc";
}
if (!string.IsNullOrEmpty(dmodel.CategoryIdsT))
{
where += $@" and (c.{nameof(RB_Distributor_HPCategory.CategoryId)} in({dmodel.CategoryIdsT}) or c.{nameof(RB_Distributor_HPCategory.CategoryId)}=-1)";
where += $@" and (c.{nameof(RB_Distributor_HPCategory.CategoryId)} in({dmodel.CategoryIdsT}) or h.{nameof(RB_Distributor_HPCommission.IsCommon)}=1)";
}
if (!string.IsNullOrEmpty(dmodel.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