diff --git a/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs b/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs index fe778f0e..22c53e60 100644 --- a/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs @@ -1,4 +1,5 @@ using BBWY.Common.Models; +using BBWY.Server.Model; using BBWY.Server.Model.Db; using BBWY.Server.Model.Dto; using System; @@ -38,11 +39,13 @@ namespace BBWY.Server.Business.Statistics CampaignId = g.Key }); - var _7dCampaignProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.CampaignId.Value) && - jr.CookieTime >= _7dStartDate && - jr.CookieTime <= _7dEndTime) - .GroupBy((jr, oc) => jr.CampaignId) + var _7dCampaignProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.CampaignId.Value) && + jr.CookieTime >= _7dStartDate && + jr.CookieTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.CampaignId) .ToList(g => new { CampaignId = g.Key, @@ -59,11 +62,13 @@ namespace BBWY.Server.Business.Statistics CampaignId = g.Key }); - var _30dCampaignProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.CampaignId.Value) && - jr.CookieTime >= _30dStartDate && - jr.CookieTime <= _30dEndTime) - .GroupBy((jr, oc) => jr.CampaignId) + var _30dCampaignProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.CampaignId.Value) && + jr.CookieTime >= _30dStartDate && + jr.CookieTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.CampaignId) .ToList(g => new { CampaignId = g.Key, @@ -80,11 +85,13 @@ namespace BBWY.Server.Business.Statistics CampaignId = g.Key }); - var customDaysCampaignProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.CampaignId.Value) && - jr.CookieTime >= gOIRequest.StartDate && - jr.CookieTime <= customEndTime) - .GroupBy((jr, oc) => jr.CampaignId) + var customDaysCampaignProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.CampaignId.Value) && + jr.CookieTime >= gOIRequest.StartDate && + jr.CookieTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.CampaignId) .ToList(g => new { CampaignId = g.Key, @@ -144,11 +151,13 @@ namespace BBWY.Server.Business.Statistics AdGroupId = g.Key }); - var _7dAdGroupProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.AdGroupId.Value) && + var _7dAdGroupProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.AdGroupId.Value) && jr.CookieTime >= _7dStartDate && - jr.CookieTime <= _7dEndTime) - .GroupBy((jr, oc) => jr.AdGroupId) + jr.CookieTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.AdGroupId) .ToList(g => new { AdGroupId = g.Key, @@ -165,16 +174,18 @@ namespace BBWY.Server.Business.Statistics AdGroupId = g.Key }); - var _30dAdGroupProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.AdGroupId.Value) && - jr.CookieTime >= _30dStartDate && - jr.CookieTime <= _30dEndTime) - .GroupBy((jr, oc) => jr.AdGroupId) - .ToList(g => new - { - AdGroupId = g.Key, - Profit = g.Sum(g.Value.Item2.Profit) - }); + var _30dAdGroupProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.AdGroupId.Value) && + jr.CookieTime >= _30dStartDate && + jr.CookieTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.AdGroupId) + .ToList(g => new + { + AdGroupId = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); var customDaysAdGroupCosts = fsql.Select().Where(x => gOIRequest.LevelIdList.Contains(x.AdGroupId.Value) && x.Date >= gOIRequest.StartDate && @@ -186,16 +197,18 @@ namespace BBWY.Server.Business.Statistics AdGroupId = g.Key }); - var customDaysAdGroupProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.AdGroupId.Value) && - jr.CookieTime >= gOIRequest.StartDate && - jr.CookieTime <= customEndTime) - .GroupBy((jr, oc) => jr.AdGroupId) - .ToList(g => new - { - AdGroupId = g.Key, - Profit = g.Sum(g.Value.Item2.Profit) - }); + var customDaysAdGroupProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.AdGroupId.Value) && + jr.CookieTime >= gOIRequest.StartDate && + jr.CookieTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.AdGroupId) + .ToList(g => new + { + AdGroupId = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); var totalAdGroupCosts = fsql.Select().Where(x => gOIRequest.LevelIdList.Contains(x.AdGroupId.Value)) .GroupBy(x => x.AdGroupId) @@ -250,11 +263,13 @@ namespace BBWY.Server.Business.Statistics AdId = g.Key }); - var _7dAdProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.AdId.Value) && + var _7dAdProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.AdId.Value) && jr.CookieTime >= _7dStartDate && - jr.CookieTime <= _7dEndTime) - .GroupBy((jr, oc) => jr.AdId) + jr.CookieTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.AdId) .ToList(g => new { AdId = g.Key, @@ -271,16 +286,18 @@ namespace BBWY.Server.Business.Statistics AdId = g.Key }); - var _30dAdProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.AdId.Value) && - jr.CookieTime >= _30dStartDate && - jr.CookieTime <= _30dEndTime) - .GroupBy((jr, oc) => jr.AdId) - .ToList(g => new - { - AdId = g.Key, - Profit = g.Sum(g.Value.Item2.Profit) - }); + var _30dAdProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.AdId.Value) && + jr.CookieTime >= _30dStartDate && + jr.CookieTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.AdId) + .ToList(g => new + { + AdId = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); var customDaysAdCosts = fsql.Select().Where(x => gOIRequest.LevelIdList.Contains(x.AdId.Value) && x.Date >= gOIRequest.StartDate && @@ -292,16 +309,18 @@ namespace BBWY.Server.Business.Statistics AdId = g.Key }); - var customDaysAdProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.AdId.Value) && - jr.CookieTime >= gOIRequest.StartDate && - jr.CookieTime <= customEndTime) - .GroupBy((jr, oc) => jr.AdId) - .ToList(g => new - { - AdId = g.Key, - Profit = g.Sum(g.Value.Item2.Profit) - }); + var customDaysAdProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.AdId.Value) && + jr.CookieTime >= gOIRequest.StartDate && + jr.CookieTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.AdId) + .ToList(g => new + { + AdId = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); var totalAdCosts = fsql.Select().Where(x => gOIRequest.LevelIdList.Contains(x.AdId.Value)) .GroupBy(x => x.AdId) @@ -357,12 +376,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dSkuProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && - jr.BusinessType == 134217728 && - jr.CookieTime >= _7dStartDate && - jr.CookieTime <= _7dEndTime) - .GroupBy((jr, oc) => jr.PopularizeSku) + var _7dSkuProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && + jr.BusinessType == 134217728 && + jr.CookieTime >= _7dStartDate && + jr.CookieTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.PopularizeSku) .ToList(g => new { Sku = g.Key, @@ -380,17 +401,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dSkuProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && - jr.BusinessType == 134217728 && - jr.CookieTime >= _30dStartDate && - jr.CookieTime <= _30dEndTime) - .GroupBy((jr, oc) => jr.PopularizeSku) - .ToList(g => new - { - Sku = g.Key, - Profit = g.Sum(g.Value.Item2.Profit) - }); + var _30dSkuProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && + jr.BusinessType == 134217728 && + jr.CookieTime >= _30dStartDate && + jr.CookieTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.PopularizeSku) + .ToList(g => new + { + Sku = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); var customDaysSkuCosts = fsql.Select().Where(x => gOIRequest.LevelIdList.Contains(x.Sku) && x.BusinessType == 134217728 && @@ -403,17 +426,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var customDaysSkuProfits = fsql.Select().InnerJoin((jr, oc) => jr.OrderId == oc.OrderId) - .Where((jr, oc) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && - jr.BusinessType == 134217728 && - jr.CookieTime >= gOIRequest.StartDate && - jr.CookieTime <= customEndTime) - .GroupBy((jr, oc) => jr.PopularizeSku) - .ToList(g => new - { - Sku = g.Key, - Profit = g.Sum(g.Value.Item2.Profit) - }); + var customDaysSkuProfits = fsql.Select().InnerJoin((jr, oc, o) => jr.OrderId == oc.OrderId) + .InnerJoin((jr, oc, o) => jr.OrderId == o.Id) + .Where((jr, oc, o) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && + jr.BusinessType == 134217728 && + jr.CookieTime >= gOIRequest.StartDate && + jr.CookieTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, oc, o) => jr.PopularizeSku) + .ToList(g => new + { + Sku = g.Key, + Profit = g.Sum(g.Value.Item2.Profit) + }); var skuTotalCosts = fsql.Select().Where(x => gOIRequest.LevelIdList.Contains(x.Sku) && x.BusinessType == 134217728) @@ -475,15 +500,17 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && + var _7dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && ocd.IsEnabled && ocd.CreateTime >= _7dStartDate && - ocd.CreateTime <= _7dEndTime) - .GroupBy(ocd => ocd.SkuId) + ocd.CreateTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) .ToList(g => new { - Profit = g.Sum(g.Value.SkuGrossProfit), + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), Sku = g.Key }); @@ -496,17 +523,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= _30dStartDate && - ocd.CreateTime <= _30dEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _30dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= _30dStartDate && + ocd.CreateTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _customCosts = fsql.Select() .Where(jas => skuIds.Contains(jas.Sku) && jas.Date >= gOIRequest.StartDate && jas.Date <= gOIRequest.EndDate) @@ -517,17 +546,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= gOIRequest.StartDate && - ocd.CreateTime <= customEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _customProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= gOIRequest.StartDate && + ocd.CreateTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _totalCosts = fsql.Select() .Where(jas => skuIds.Contains(jas.Sku)) @@ -590,15 +621,17 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && + var _7dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && ocd.IsEnabled && ocd.CreateTime >= _7dStartDate && - ocd.CreateTime <= _7dEndTime) - .GroupBy(ocd => ocd.SkuId) + ocd.CreateTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) .ToList(g => new { - Profit = g.Sum(g.Value.SkuGrossProfit), + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), Sku = g.Key }); @@ -611,17 +644,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= _30dStartDate && - ocd.CreateTime <= _30dEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _30dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= _30dStartDate && + ocd.CreateTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _customCosts = fsql.Select() .Where(jas => skuIds.Contains(jas.Sku) && jas.Date >= gOIRequest.StartDate && jas.Date <= gOIRequest.EndDate) @@ -632,17 +667,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= gOIRequest.StartDate && - ocd.CreateTime <= customEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _customProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= gOIRequest.StartDate && + ocd.CreateTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _totalCosts = fsql.Select() .Where(jas => skuIds.Contains(jas.Sku)) @@ -705,15 +742,17 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && + var _7dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && ocd.IsEnabled && ocd.CreateTime >= _7dStartDate && - ocd.CreateTime <= _7dEndTime) - .GroupBy(ocd => ocd.SkuId) + ocd.CreateTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) .ToList(g => new { - Profit = g.Sum(g.Value.SkuGrossProfit), + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), Sku = g.Key }); @@ -726,17 +765,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= _30dStartDate && - ocd.CreateTime <= _30dEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _30dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= _30dStartDate && + ocd.CreateTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _customCosts = fsql.Select() .Where(jas => skuIds.Contains(jas.Sku) && jas.Date >= gOIRequest.StartDate && jas.Date <= gOIRequest.EndDate) @@ -747,17 +788,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .Where(ocd => skuIds.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= gOIRequest.StartDate && - ocd.CreateTime <= customEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _customProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => skuIds.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= gOIRequest.StartDate && + ocd.CreateTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _totalCosts = fsql.Select() .Where(jas => skuIds.Contains(jas.Sku)) @@ -816,15 +859,17 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .Where(ocd => gOIRequest.LevelIdList.Contains(ocd.SkuId) && + var _7dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => gOIRequest.LevelIdList.Contains(ocd.SkuId) && ocd.IsEnabled && ocd.CreateTime >= _7dStartDate && - ocd.CreateTime <= _7dEndTime) - .GroupBy(ocd => ocd.SkuId) + ocd.CreateTime <= _7dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) .ToList(g => new { - Profit = g.Sum(g.Value.SkuGrossProfit), + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), Sku = g.Key }); @@ -838,17 +883,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .Where(ocd => gOIRequest.LevelIdList.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= _30dStartDate && - ocd.CreateTime <= _30dEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _30dProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => gOIRequest.LevelIdList.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= _30dStartDate && + ocd.CreateTime <= _30dEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _customCosts = fsql.Select() .Where(jas => gOIRequest.LevelIdList.Contains(jas.Sku) && @@ -860,17 +907,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .Where(ocd => gOIRequest.LevelIdList.Contains(ocd.SkuId) && - ocd.IsEnabled && - ocd.CreateTime >= gOIRequest.StartDate && - ocd.CreateTime <= customEndTime) - .GroupBy(ocd => ocd.SkuId) - .ToList(g => new - { - Profit = g.Sum(g.Value.SkuGrossProfit), - Sku = g.Key - }); + var _customProfits = fsql.Select() + .InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => gOIRequest.LevelIdList.Contains(ocd.SkuId) && + ocd.IsEnabled && + ocd.CreateTime >= gOIRequest.StartDate && + ocd.CreateTime <= customEndTime && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((ocd, o) => ocd.SkuId) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item1.SkuGrossProfit), + Sku = g.Key + }); var _totalSkuCosts = fsql.Select() .Where(jas => gOIRequest.LevelIdList.Contains(jas.Sku)) @@ -931,12 +980,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _7dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= _7dStartDate && jr.CookieTime <= _7dEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -952,12 +1003,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _30dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= _30dStartDate && jr.CookieTime <= _30dEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -973,12 +1026,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _customProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= gOIRequest.StartDate && jr.CookieTime <= customEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1046,12 +1101,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _7dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= _7dStartDate && jr.CookieTime <= _7dEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1067,12 +1124,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && - jr.CookieTime >= _30dStartDate && jr.CookieTime <= _30dEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + var _30dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && + jr.CookieTime >= _30dStartDate && jr.CookieTime <= _30dEndTime && + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1088,12 +1147,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && - jr.CookieTime >= gOIRequest.StartDate && jr.CookieTime <= customEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + var _customProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && + jr.CookieTime >= gOIRequest.StartDate && jr.CookieTime <= customEndTime && + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1161,12 +1222,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _7dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= _7dStartDate && jr.CookieTime <= _7dEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1182,12 +1245,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _30dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= _30dStartDate && jr.CookieTime <= _30dEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1203,12 +1268,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => skuIds.Contains(jr.PopularizeSku) && + var _customProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => skuIds.Contains(jr.PopularizeSku) && jr.CookieTime >= gOIRequest.StartDate && jr.CookieTime <= customEndTime && - ocd.IsEnabled == true) - .GroupBy((jr, ocd) => jr.PopularizeSku) + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1272,13 +1339,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _7dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && - ocd.IsEnabled && - jr.CookieTime >= _7dStartDate && - jr.CookieTime <= _7dEndTime) - .GroupBy((jr, ocd) => jr.PopularizeSku) + var _7dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && + jr.CookieTime >= _7dStartDate && jr.CookieTime <= _7dEndTime && + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1295,13 +1363,14 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _30dProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && - ocd.IsEnabled && - jr.CookieTime >= _30dStartDate && - jr.CookieTime <= _30dEndTime) - .GroupBy((jr, ocd) => jr.PopularizeSku) + var _30dProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && + jr.CookieTime >= _30dStartDate && jr.CookieTime <= _30dEndTime && + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) .ToList(g => new { Profit = g.Sum(g.Value.Item2.SkuGrossProfit), @@ -1318,18 +1387,19 @@ namespace BBWY.Server.Business.Statistics Sku = g.Key }); - var _customProfits = fsql.Select() - .InnerJoin((jr, ocd) => jr.OrderId == ocd.OrderId) - .Where((jr, ocd) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && - ocd.IsEnabled && - jr.CookieTime >= gOIRequest.StartDate && - jr.CookieTime <= customEndTime) - .GroupBy((jr, ocd) => jr.PopularizeSku) - .ToList(g => new - { - Profit = g.Sum(g.Value.Item2.SkuGrossProfit), - Sku = g.Key - }); + var _customProfits = fsql.Select() + .InnerJoin((jr, ocd, o) => jr.OrderId == ocd.OrderId) + .InnerJoin((jr, ocd, o) => jr.OrderId == o.Id) + .Where((jr, ocd, o) => gOIRequest.LevelIdList.Contains(jr.PopularizeSku) && + jr.CookieTime >= gOIRequest.StartDate && jr.CookieTime <= customEndTime && + ocd.IsEnabled == true && + o.OrderState != Enums.OrderState.已取消) + .GroupBy((jr, ocd, o) => jr.PopularizeSku) + .ToList(g => new + { + Profit = g.Sum(g.Value.Item2.SkuGrossProfit), + Sku = g.Key + }); var _totalSkuCosts = fsql.Select() .Where(jas => gOIRequest.LevelIdList.Contains(jas.Sku))