|
|
@ -392,7 +392,9 @@ namespace SiNan.Business |
|
|
|
foreach (var product in productList) |
|
|
|
{ |
|
|
|
var currentProductSkuIdList = skuList.Where(s => s.ProductId == product.Id).Select(s => s.Id).ToList(); |
|
|
|
product.Logo = skuList.FirstOrDefault(s => currentProductSkuIdList.Contains(s.Id))?.Logo; |
|
|
|
var firstSku = skuList.FirstOrDefault(s => currentProductSkuIdList.Contains(s.Id)); |
|
|
|
product.Logo = firstSku?.Logo; |
|
|
|
product.MainSkuId = firstSku?.Id; |
|
|
|
var currentProductHistoryPopularizeLevelGOIList = historyPopularizeLevelGOIList.Where(x => currentProductSkuIdList.Contains(x.Sku)); |
|
|
|
|
|
|
|
var totalCost = currentProductHistoryPopularizeLevelGOIList.Sum(x => x.Cost); |
|
|
@ -729,7 +731,7 @@ namespace SiNan.Business |
|
|
|
if (request.EndDate == null) |
|
|
|
request.EndDate = DateTime.Now.Date.AddDays(-1); |
|
|
|
return fsql.Select<AggregationJDPopularizeSkuDaily>().Where(a => a.ShopId == request.ShopId && |
|
|
|
a.ProductId == request.Sku && |
|
|
|
a.SkuId == request.Sku && |
|
|
|
a.Date >= request.StartDate && |
|
|
|
a.Date <= request.EndDate) |
|
|
|
.OrderBy(a => a.Date) |
|
|
|