Skip to content

M
mall.oytour.com
Commit b84aace7 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 1235e863 056d164d
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 17 deletions
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ b84aace7
...@@ -170,19 +170,24 @@ namespace Mall.WebApi.Controllers ...@@ -170,19 +170,24 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, 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) if (tempGood != null && tempGood.Id > 0)
{ {
lastItem.name = tempGood?.Name ?? lastItem.name; lastItem.name = tempGood.Name;
lastItem.price = Math.Round((tempGood?.SellingPrice ?? lastItem.price), 2); lastItem.price = Math.Round((tempGood?.SellingPrice??0), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(lastItem.picUrl); lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2); lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(lastItem);
} }
} }
childItem.goodsList = newGoodsList;
} }
} }
//自动添加商品 //自动添加商品
...@@ -193,7 +198,8 @@ namespace Mall.WebApi.Controllers ...@@ -193,7 +198,8 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
CategoryIds = childItem.id.ToString() CategoryIds = childItem.id.ToString(),
GoodsStatus = 1
}); });
if (catGoodsList != null && catGoodsList.Count > 0) if (catGoodsList != null && catGoodsList.Count > 0)
{ {
...@@ -223,7 +229,8 @@ namespace Mall.WebApi.Controllers ...@@ -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() var goodsList = productModule.GetProductGoodsPageList(1, goodsData.goodsLength, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId MallBaseId = MallBaseId,
GoodsStatus = 1
}); });
if (goodsList != null && goodsList.Count > 0) if (goodsList != null && goodsList.Count > 0)
{ {
...@@ -250,19 +257,23 @@ namespace Mall.WebApi.Controllers ...@@ -250,19 +257,23 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, 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) if (tempGood != null && tempGood.Id > 0)
{ {
childItem.name = tempGood?.Name ?? childItem.name; childItem.name = tempGood?.Name ?? "";
childItem.price = Math.Round((tempGood?.SellingPrice ?? childItem.price), 2); childItem.price = Math.Round((tempGood?.SellingPrice ?? 0), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(childItem.picUrl); childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2); childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(childItem);
} }
} }
goodsData.list = newGoodsList;
} }
} }
} }
...@@ -732,11 +743,11 @@ namespace Mall.WebApi.Controllers ...@@ -732,11 +743,11 @@ namespace Mall.WebApi.Controllers
var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId MallBaseId = miniProgram.MallBaseId,
GoodsStatus=1,
}); });
if (goodsList != null && goodsList.Count > 0) if (goodsList != null && goodsList.Count > 0)
{ {
foreach (var gItem in goodsList) foreach (var gItem in goodsList)
{ {
cats.goodsList.Add(new GoodsDetailsItem2() cats.goodsList.Add(new GoodsDetailsItem2()
...@@ -756,7 +767,8 @@ namespace Mall.WebApi.Controllers ...@@ -756,7 +767,8 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId, MallBaseId = miniProgram.MallBaseId,
CategoryIds = subitem.relation_id.ToString() CategoryIds = subitem.relation_id.ToString(),
GoodsStatus = 1,
}); });
if (goodsList != null && goodsList.Count > 0) 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