pengcong001
/
SiNan
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/SiNan

master
shanji 1 year ago
parent
7ec2949f9f cc14fc7cba
commit
caff4aa8bb
8 changed files with 226 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      SiNan.Business/AggregationBusiness.cs
  2. 102
      SiNan.Business/GOIBusiness.cs
  3. 9
      SiNan.Model/Core/ROI/ROIByAdSku.cs
  4. 7
      SiNan.Model/Core/ROI/ROIBySku.cs
  5. 26
      SiNan.Model/Core/ROI/ROICore.cs
  6. 18
      SiNan.Model/Db/Aggregation/AggregationJDPopularizeAdSkuDaily.cs
  7. 7
      SiNan.Model/Db/Aggregation/AggregationJDPopularizeSku.cs
  8. 23
      SiNan.Model/Db/Aggregation/AggregationJDPopularizeSkuDaily.cs

44
SiNan.Business/AggregationBusiness.cs
View File

@ -3,6 +3,7 @@ using SiNan.Common.Log;
using SiNan.Common.Models;
using SiNan.Model;
using SiNan.Model.Core;
using SiNan.Model.Core.ROI;
using SiNan.Model.Db;
using SiNan.Model.Dto;
using Yitter.IdGenerator;
@ -192,10 +193,15 @@ namespace SiNan.Business
var aggregationDate_ProductLevelList = goiBusiness.StatisticsProductLevelGOI(currentGroupSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_PopularizeLevelList = goiBusiness.StatisticsPopularizeLevelGOI(currentGroupSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_SkuActualAmountList = StatisticsActualAmountBySku(currentGroupSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_PopularizeLevelROIList = goiBusiness.StatisticsPopluarizeLvelROI(currentGroupSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_DirectPopularizeLevelROIList = goiBusiness.StatisticsPopluarizeLvelROI(currentGroupSkuIdList, startDate_aggregationDate, endDate_aggregationDate, true);
IList<GOIBySku> recent7d_ProductLevelList = null;
IList<GOIBySku> recent7d_PopularizeLevelList = null;
IList<GOIBySku> recent30d_ProductLevelList = null;
IList<GOIBySku> recent30d_PopularizeLevelList = null;
IList<ROIBySku> recent7d_PopluarizeLevelROIList = null;
if (isLastDate && (DateTime.Now.Date - startDate_aggregationDate).TotalDays <= 31)
@ -211,6 +217,7 @@ namespace SiNan.Business
recent7d_PopularizeLevelList = goiBusiness.StatisticsPopularizeLevelGOI(currentGroupSkuIdList, startDate_Recent7day, endDate_Recent7day);
recent30d_ProductLevelList = goiBusiness.StatisticsProductLevelGOI(currentGroupSkuIdList, startDate_Recent30day, endDate_Recent30day); ;
recent30d_PopularizeLevelList = goiBusiness.StatisticsPopularizeLevelGOI(currentGroupSkuIdList, startDate_Recent30day, endDate_Recent30day);
recent7d_PopluarizeLevelROIList = goiBusiness.StatisticsPopluarizeLvelROI(currentGroupSkuIdList, startDate_Recent7day, endDate_Recent7day);
}
foreach (var spuId in spuGroup)
@ -223,6 +230,8 @@ namespace SiNan.Business
IList<GOIBySku> currentSpu_Recent30d_ProductLevelList = recent30d_ProductLevelList?.Where(x => currentSpuSkuIdList.Contains(x.Sku)).ToList();
IList<GOIBySku> currentSpu_Recent30d_PopularizeLevelList = recent30d_PopularizeLevelList?.Where(x => currentSpuSkuIdList.Contains(x.Sku)).ToList();
//var currentSpu_AggregationDate_PopularizeLevelROIList = aggregationDate_PopularizeLevelROIList.Where(x => currentSpuSkuIdList.Contains(x.Sku)).ToList();
#region 处理SPU每日聚合
var spugoi_AggregationDate_ProductLevel = new GOIBySpu()
{
@ -339,10 +348,13 @@ namespace SiNan.Business
#region 处理SKU每日聚合
var skugoi_AggregationDate_ProductLevel = currentSpu_AggregationDate_ProductLevelList.FirstOrDefault(x => x.Sku == skuId);
var skugoi_AggregationDate_PopularizeLevel = currentSpu_AggregationDate_PopularizeLevelList.FirstOrDefault(x => x.Sku == skuId);
var skuroi_aggregationDate_PopularizeLevelROI = aggregationDate_PopularizeLevelROIList.FirstOrDefault(x => x.Sku == skuId);
var skuroi_aggregationDate_DirectPopularizeLevelROI = aggregationDate_DirectPopularizeLevelROIList.FirstOrDefault(x => x.Sku == skuId);
var skugoi_Recent7d_ProductLevel = currentSpu_Recent7d_ProductLevelList?.FirstOrDefault(x => x.Sku == skuId);
var skugoi_Recent7d_PopularizeLevel = currentSpu_Recent7d_PopularizeLevelList?.FirstOrDefault(x => x.Sku == skuId);
var skugoi_Recent30d_ProductLevel = currentSpu_Recent30d_ProductLevelList?.FirstOrDefault(x => x.Sku == skuId);
var skugoi_Recent30d_PopularizeLevel = currentSpu_Recent30d_PopularizeLevelList?.FirstOrDefault(x => x.Sku == skuId);
var skuroi_Recent7d_PopularizeLevel = recent7d_PopluarizeLevelROIList?.FirstOrDefault(x => x.Sku == skuId);
var skuDailyAggregation = new AggregationJDPopularizeSkuDaily()
{
@ -357,7 +369,11 @@ namespace SiNan.Business
ProductLevelGOI = skugoi_AggregationDate_ProductLevel?.GOI ?? 0M,
PopularizeLevelProfit = skugoi_AggregationDate_PopularizeLevel?.Profit ?? 0M,
PopularizeLevelGOI = skugoi_AggregationDate_PopularizeLevel?.GOI ?? 0M,
ActualAmount = aggregationDate_SkuActualAmountList.FirstOrDefault(x => x.Sku == skuId)?.ActualAmount ?? 0M
ActualAmount = aggregationDate_SkuActualAmountList.FirstOrDefault(x => x.Sku == skuId)?.ActualAmount ?? 0M,
PopularizeAmount = skuroi_aggregationDate_PopularizeLevelROI?.Amount ?? 0M,
PopularizeLevelROI = skuroi_aggregationDate_PopularizeLevelROI?.ROI ?? 0M,
DirectPopularizeAmount = skuroi_aggregationDate_DirectPopularizeLevelROI?.Amount ?? 0M,
DirectPopularizeLevelROI = skuroi_aggregationDate_DirectPopularizeLevelROI?.ROI ?? 0M
};
insertAggregationSkuDailyList.Add(skuDailyAggregation);
#endregion
@ -387,7 +403,8 @@ namespace SiNan.Business
Recent30dProductLevelProfit = skugoi_Recent30d_ProductLevel?.Profit ?? 0M,
Recent30dProductLevelGOI = skugoi_Recent30d_ProductLevel?.GOI ?? 0M,
Recent30dPopularizeLevelProfit = skugoi_Recent30d_PopularizeLevel?.Profit ?? 0M,
Recent30dPopularizeLevelGOI = skugoi_Recent30d_PopularizeLevel?.GOI ?? 0M
Recent30dPopularizeLevelGOI = skugoi_Recent30d_PopularizeLevel?.GOI ?? 0M,
Recent7dPopularizeLevelROI = skuroi_Recent7d_PopularizeLevel?.ROI ?? 0M
});
}
else
@ -831,7 +848,10 @@ namespace SiNan.Business
List<AggregationJDPopularizeAdSkuDaily> insertAggregationAdSkuDailyList = new List<AggregationJDPopularizeAdSkuDaily>();
var aggregationDate_PopularizeLevelList = goiBusiness.CalculationAdSkuLevelGOI(adSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_ProductLevelList = goiBusiness.CalculationAdSkuProductLevelGOI(adSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_SkuPopularizeAmountList = StatisticsPopularizeAmountBySku(adSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
//var aggregationDate_SkuPopularizeAmountList = StatisticsPopularizeAmountBySku(adSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_PopularizeLevelROIList = goiBusiness.StatisticsAdSkuLvelROI(adSkuIdList, startDate_aggregationDate, endDate_aggregationDate);
var aggregationDate_DirectPopularizeLevelROIList = goiBusiness.StatisticsAdSkuLvelROI(adSkuIdList, startDate_aggregationDate, endDate_aggregationDate, true);
var adSkuIndex = 0;
foreach (var adSku in adSkuList)
@ -845,9 +865,14 @@ namespace SiNan.Business
x.CampaignId == adSku.CampaignId);
var adSkuGoi_AggregationDate_ProductLevel = aggregationDate_ProductLevelList.FirstOrDefault(x => x.Sku == adSku.Sku && x.BusinessType == adSku.BusinessType);
var adSkuPoplarizeAmount = aggregationDate_SkuPopularizeAmountList.FirstOrDefault(x => x.Sku == adSku.Sku &&
x.BusinessType == adSku.BusinessType &&
x.CampaignId == adSku.CampaignId);
//var adSkuPoplarizeAmount = aggregationDate_SkuPopularizeAmountList.FirstOrDefault(x => x.Sku == adSku.Sku && x.BusinessType == adSku.BusinessType && x.CampaignId == adSku.CampaignId);
var adSkuPopularizeROI = aggregationDate_PopularizeLevelROIList.FirstOrDefault(x => x.Sku == adSku.Sku &&
x.BusinessType == adSku.BusinessType &&
x.CampaignId == adSku.CampaignId);
var adSkuDirectPopularizeROI = aggregationDate_DirectPopularizeLevelROIList.FirstOrDefault(x => x.Sku == adSku.Sku &&
x.BusinessType == adSku.BusinessType &&
x.CampaignId == adSku.CampaignId);
var adSkuDailyAggregation = new AggregationJDPopularizeAdSkuDaily()
{
@ -865,8 +890,11 @@ namespace SiNan.Business
BusinessType = adSku.BusinessType,
SkuId = adSku.Sku,
AdId = adSku.AdId,
PopularizeAmount = adSkuPoplarizeAmount?.ActualAmount ?? 0M,
Clicks = adSkuGoi_AggregationDate_PopularizeLevel?.Clicks ?? 0
Clicks = adSkuGoi_AggregationDate_PopularizeLevel?.Clicks ?? 0,
PopularizeAmount = adSkuPopularizeROI?.Amount ?? 0M,
PopularizeLevelROI = adSkuPopularizeROI?.ROI ?? 0M,
DirectPopularizeAmount = adSkuDirectPopularizeROI?.Amount ?? 0M,
DirectPopularizeLevelROI = adSkuDirectPopularizeROI?.ROI ?? 0M
};
insertAggregationAdSkuDailyList.Add(adSkuDailyAggregation);

102
SiNan.Business/GOIBusiness.cs
View File

@ -6,6 +6,7 @@ using SiNan.Common.Log;
using SiNan.Common.Models;
using SiNan.Model;
using SiNan.Model.Core;
using SiNan.Model.Core.ROI;
using SiNan.Model.Db;
using SiNan.Model.Dto;
using Yitter.IdGenerator;
@ -57,7 +58,7 @@ namespace SiNan.Business
return list;
}
public IList<GOIBySku> StatisticsPopularizeLevelGOI(IList<string> skuIdList, DateTime? startDate, DateTime? endDate)
public IList<GOIBySku> StatisticsPopularizeLevelGOI(IList<string> skuIdList, DateTime? startDate, DateTime? endDate, bool isDirect = false)
{
IList<GOIBySku> list = new List<GOIBySku>();
@ -96,6 +97,46 @@ namespace SiNan.Business
return list;
}
public IList<ROIBySku> StatisticsPopluarizeLvelROI(IList<string> skuIdList, DateTime? startDate, DateTime? endDate, bool isDirect = false)
{
var costs = fsql.Select<JDPopularizeAdSku>()
.Where(jas => skuIdList.Contains(jas.Sku)) // &&jas.Date >= startDate && jas.Date <= endDate
.WhereIf(startDate != null, jas => jas.Date >= startDate)
.WhereIf(endDate != null, jas => jas.Date <= endDate)
.GroupBy(jas => jas.Sku)
.ToList(g => new
{
Cost = g.Sum(g.Value.Cost),
Sku = g.Key
});
var amounts = fsql.Select<JDOrderPopularizeRelation, Order, OrderSku>()
.InnerJoin((jr, o, osku) => jr.OrderId == o.Id)
.InnerJoin((jr, o, osku) => o.Id == osku.OrderId)
.Where((jr, o, osku) => o.OrderState != Enums.OrderState.已取消 &&
o.IsGift == false &&
jr.CookieTime >= startDate &&
jr.CookieTime <= endDate &&
osku.Price > 0 &&
skuIdList.Contains(jr.PopularizeSku))
.WhereIf(isDirect, (jr, o, osku) => jr.PlaceOrderSku == jr.PopularizeSku)
.GroupBy((jr, o, osku) => jr.PopularizeSku)
.ToList(g => new PopularizeAmountBySku
{
ActualAmount = g.Sum(g.Value.Item3.ActualAmount * g.Value.Item3.ItemTotal),
Sku = g.Key
});
IList<ROIBySku> list = new List<ROIBySku>();
foreach (var skuId in skuIdList)
{
var cost = costs.FirstOrDefault(x => x.Sku == skuId)?.Cost ?? 0M;
var amount = amounts.FirstOrDefault(x => x.Sku == skuId)?.ActualAmount ?? 0M;
var skuroi = new ROIBySku() { Sku = skuId, Cost = cost, Amount = amount };
list.Add(skuroi);
}
return list;
}
private GOIByShop StatisticsProductLevelGOI(long shopId, DateTime? startDate, DateTime? endDate)
{
var cost = fsql.Select<JDPopularizeAdSku>()
@ -251,6 +292,63 @@ namespace SiNan.Business
return list;
}
public IList<ROIByAdSku> StatisticsAdSkuLvelROI(IList<string> skuIdList, DateTime? startDate, DateTime? endDate, bool isDirect = false)
{
var costs = fsql.Select<JDPopularizeAdSku>()
.Where(jas => skuIdList.Contains(jas.Sku)) // &&jas.Date >= startDate && jas.Date <= endDate
.WhereIf(startDate != null, jas => jas.Date >= startDate)
.WhereIf(endDate != null, jas => jas.Date <= endDate)
.GroupBy(jas => new { jas.Sku, jas.BusinessType, jas.CampaignId })
.ToList(g => new
{
Cost = g.Sum(g.Value.Cost),
Sku = g.Key.Sku,
g.Key.BusinessType,
g.Key.CampaignId
});
var amounts = fsql.Select<JDOrderPopularizeRelation, Order, OrderSku>()
.InnerJoin((jr, o, osku) => jr.OrderId == o.Id)
.InnerJoin((jr, o, osku) => o.Id == osku.OrderId)
.Where((jr, o, osku) => o.OrderState != Enums.OrderState.已取消 &&
o.IsGift == false &&
jr.CookieTime >= startDate &&
jr.CookieTime <= endDate &&
osku.Price > 0 &&
skuIdList.Contains(jr.PopularizeSku))
.WhereIf(isDirect, (jr, o, osku) => jr.PlaceOrderSku == jr.PopularizeSku)
.GroupBy((jr, o, osku) => new { jr.PopularizeSku, jr.BusinessType, jr.CampaignId })
.ToList(g => new PopularizeAmountBySku
{
ActualAmount = g.Sum(g.Value.Item3.ActualAmount * g.Value.Item3.ItemTotal),
Sku = g.Key.PopularizeSku,
BusinessType = g.Key.BusinessType,
CampaignId = g.Key.CampaignId
});
IList<ROIByAdSku> list = new List<ROIByAdSku>();
foreach (var skuId in skuIdList)
{
var currentCosts = costs.Where(c => c.Sku == skuId).ToList();
foreach (var cost in currentCosts)
{
var amount = amounts.FirstOrDefault(x => x.Sku == skuId &&
x.BusinessType == cost.BusinessType &&
x.CampaignId == cost.CampaignId);
var adskuroi = new ROIByAdSku()
{
Sku = skuId,
Cost = cost.Cost,
Amount = amount?.ActualAmount ?? 0M,
BusinessType = cost.BusinessType.Value,
CampaignId = cost.CampaignId.Value,
};
list.Add(adskuroi);
}
}
return list;
}
public IList<GOIByAdSku> CalculationAdSkuProductLevelGOI(IList<string> skuIdList, DateTime startDate, DateTime endDate)
{
var costs = fsql.Select<JDPopularizeAdSku>()
@ -266,7 +364,7 @@ namespace SiNan.Business
var profits = fsql.Select<OrderCostDetail, Order>()
.InnerJoin((ocd, o) => ocd.OrderId == o.Id)
.Where((ocd, o) => skuIdList.Contains(ocd.SkuId) &&
ocd.IsEnabled==true &&
ocd.IsEnabled == true &&
o.StartTime >= startDate &&
o.StartTime <= endDate &&
o.OrderState != Enums.OrderState.已取消 &&

9
SiNan.Model/Core/ROI/ROIByAdSku.cs
View File

@ -0,0 +1,9 @@
namespace SiNan.Model.Core.ROI
{
public class ROIByAdSku : ROIBySku
{
public int BusinessType { get; set; }
public long CampaignId { get; set; }
}
}

7
SiNan.Model/Core/ROI/ROIBySku.cs
View File

@ -0,0 +1,7 @@
namespace SiNan.Model.Core.ROI
{
public class ROIBySku : ROICore
{
public string Sku { get; set; }
}
}

26
SiNan.Model/Core/ROI/ROICore.cs
View File

@ -0,0 +1,26 @@
namespace SiNan.Model.Core
{
public class ROICore
{
/// <summary>
/// 花费
/// </summary>
public decimal Cost { get; set; }
/// <summary>
/// 成交额
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// ROI
/// </summary>
public decimal ROI
{
get
{
return Cost == 0M ? 0M : Math.Round(Amount / Cost, 2);
}
}
}
}

18
SiNan.Model/Db/Aggregation/AggregationJDPopularizeAdSkuDaily.cs
View File

@ -87,6 +87,24 @@ namespace SiNan.Model.Db
[Column(DbType = "int")]
public int? Clicks { get; set; } = 0;
/// <summary>
/// 推广维度ROI
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? PopularizeLevelROI { get; set; } = 0.00M;
/// <summary>
/// 直接推广营业额(SKU实收)
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? DirectPopularizeAmount { get; set; } = 0.00M;
/// <summary>
/// 直接推广维度ROI
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? DirectPopularizeLevelROI { get; set; } = 0.00M;
}
}

7
SiNan.Model/Db/Aggregation/AggregationJDPopularizeSku.cs
View File

@ -1,4 +1,5 @@
using FreeSql.DataAnnotations;
using System.Text;
namespace SiNan.Model.Db
{
@ -120,6 +121,12 @@ namespace SiNan.Model.Db
[Column(DbType = "datetime")]
public DateTime? Date { get; set; }
/// <summary>
/// 近7天推广维度ROI
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? Recent7dPopularizeLevelROI { get; set; } = 0.00M;
}
}

23
SiNan.Model/Db/Aggregation/AggregationJDPopularizeSkuDaily.cs
View File

@ -67,6 +67,29 @@ namespace SiNan.Model.Db
[Column(DbType = "decimal(18,2)")]
public decimal? ActualAmount { get; set; } = 0.00M;
/// <summary>
/// 推广营业额(SKU实收)
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? PopularizeAmount { get; set; } = 0.00M;
/// <summary>
/// 推广维度ROI
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? PopularizeLevelROI { get; set; } = 0.00M;
/// <summary>
/// 直接推广营业额(SKU实收)
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? DirectPopularizeAmount { get; set; } = 0.00M;
/// <summary>
/// 直接推广维度ROI
/// </summary>
[Column(DbType = "decimal(18,2)")]
public decimal? DirectPopularizeLevelROI { get; set; } = 0.00M;
}
}

Write Preview
Loading…
Cancel
Save