Commit 056d164d authored by 黄奎's avatar 黄奎

小程序首页排除下架商品

parent 70eb7fe4
......@@ -170,19 +170,24 @@ namespace Mall.WebApi.Controllers
{
TenantId = TenantId,
MallBaseId = MallBaseId,
GoodsIds = Ids
GoodsIds = Ids,
GoodsStatus=1
});
foreach (var lastItem in childItem.goodsList)
List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
foreach (var tempGood in tempGoodsList)
{
var tempGood = tempGoodsList?.Where(qitem => qitem.Id == lastItem.id)?.FirstOrDefault();
var lastItem = new GoodsDetailsItem2();
if (tempGood != null && tempGood.Id > 0)
{
lastItem.name = tempGood?.Name ?? lastItem.name;
lastItem.price = Math.Round((tempGood?.SellingPrice ?? lastItem.price), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(lastItem.picUrl);
lastItem.name = tempGood.Name;
lastItem.price = Math.Round((tempGood?.SellingPrice??0), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(lastItem);
}
}
childItem.goodsList = newGoodsList;
}
}
//自动添加商品
......@@ -193,7 +198,8 @@ namespace Mall.WebApi.Controllers
{
TenantId = TenantId,
MallBaseId = MallBaseId,
CategoryIds = childItem.id.ToString()
CategoryIds = childItem.id.ToString(),
GoodsStatus = 1
});
if (catGoodsList != null && catGoodsList.Count > 0)
{
......@@ -223,7 +229,8 @@ namespace Mall.WebApi.Controllers
var goodsList = productModule.GetProductGoodsPageList(1, goodsData.goodsLength, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{
TenantId = TenantId,
MallBaseId = MallBaseId
MallBaseId = MallBaseId,
GoodsStatus = 1
});
if (goodsList != null && goodsList.Count > 0)
{
......@@ -250,19 +257,23 @@ namespace Mall.WebApi.Controllers
{
TenantId = TenantId,
MallBaseId = MallBaseId,
GoodsIds = Ids
GoodsIds = Ids,
GoodsStatus = 1
});
foreach (var childItem in goodsData.list)
List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
foreach (var tempGood in tempGoodsList)
{
var tempGood = tempGoodsList?.Where(qitem => qitem.Id == childItem.id)?.FirstOrDefault();
var childItem = new GoodsDetailsItem2();
if (tempGood != null && tempGood.Id > 0)
{
childItem.name = tempGood?.Name ?? childItem.name;
childItem.price = Math.Round((tempGood?.SellingPrice ?? childItem.price), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(childItem.picUrl);
childItem.name = tempGood?.Name ?? "";
childItem.price = Math.Round((tempGood?.SellingPrice ?? 0), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(childItem);
}
}
goodsData.list = newGoodsList;
}
}
}
......@@ -732,11 +743,11 @@ namespace Mall.WebApi.Controllers
var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{
TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId
MallBaseId = miniProgram.MallBaseId,
GoodsStatus=1,
});
if (goodsList != null && goodsList.Count > 0)
{
foreach (var gItem in goodsList)
{
cats.goodsList.Add(new GoodsDetailsItem2()
......@@ -756,7 +767,8 @@ namespace Mall.WebApi.Controllers
{
TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId,
CategoryIds = subitem.relation_id.ToString()
CategoryIds = subitem.relation_id.ToString(),
GoodsStatus = 1,
});
if (goodsList != null && goodsList.Count > 0)
{
......
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