From 2e83093d0119895e4aa0720664daff7ec47f9bd6 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 5 Jan 2024 09:17:20 +0800
Subject: [PATCH] =?UTF-8?q?SKU=E6=8E=A8=E5=B9=BF=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E8=81=9A=E5=90=88=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=87=8F=E6=8C=87=E6=A0=87=E8=81=9A=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SiNan.Business/AggregationBusiness.cs               |  5 +++--
 SiNan.Business/GOIBusiness.cs                       | 13 ++++++++-----
 SiNan.Model/Core/GOI/GOIByAdSku.cs                  |  2 ++
 .../AggregationJDPopularizeAdSkuDaily.cs            |  5 ++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/SiNan.Business/AggregationBusiness.cs b/SiNan.Business/AggregationBusiness.cs
index 9e255cd..62d7f69 100644
--- a/SiNan.Business/AggregationBusiness.cs
+++ b/SiNan.Business/AggregationBusiness.cs
@@ -764,7 +764,7 @@ namespace SiNan.Business
         }
         #endregion
 
-        #region SKU创意/推广维度聚合任务
+        #region SKU维度聚合任务
         public void StartAdSkuAggregationTask()
         {
             StartAdSkuAggregationTaskByCondition(new AdSkuAggregationRequest()
@@ -852,7 +852,8 @@ namespace SiNan.Business
                     BusinessType = adSku.BusinessType,
                     SkuId = adSku.Sku,
                     AdId = adSku.AdId,
-                    PopularizeAmount = adSkuPoplarizeAmount?.ActualAmount ?? 0M
+                    PopularizeAmount = adSkuPoplarizeAmount?.ActualAmount ?? 0M,
+                    Clicks = adSkuGoi_AggregationDate_PopularizeLevel?.Clicks ?? 0
                 };
                 insertAggregationAdSkuDailyList.Add(adSkuDailyAggregation);
 
diff --git a/SiNan.Business/GOIBusiness.cs b/SiNan.Business/GOIBusiness.cs
index 115562a..632bf64 100644
--- a/SiNan.Business/GOIBusiness.cs
+++ b/SiNan.Business/GOIBusiness.cs
@@ -205,8 +205,9 @@ namespace SiNan.Business
                                    .ToList(g => new
                                    {
                                        Cost = g.Sum(g.Value.Cost),
-                                       Sku = g.Key.Sku,
-                                       BusinessType = g.Key.BusinessType
+                                       Clicks = g.Sum(g.Value.Clicks),
+                                       g.Key.Sku,
+                                       g.Key.BusinessType
                                    });
 
             var profits = fsql.Select<JDOrderPopularizeRelation, OrderCostDetail, Order>()
@@ -221,7 +222,7 @@ namespace SiNan.Business
                                    {
                                        Profit = g.Sum(g.Value.Item2.SkuGrossProfit),
                                        Sku = g.Key.PopularizeSku,
-                                       BusinessType = g.Key.BusinessType
+                                       g.Key.BusinessType
                                    });
 
             IList<GOIByAdSku> list = new List<GOIByAdSku>();
@@ -233,8 +234,9 @@ namespace SiNan.Business
                     if (kuaicheCost != null || kuaicheProfit != null)
                     {
                         var cost = kuaicheCost?.Cost ?? 0M;
+                        var clicks = kuaicheCost?.Clicks ?? 0;
                         var profit = kuaicheProfit?.Profit ?? 0M;
-                        var adskuGoi = new GOIByAdSku() { Sku = skuId, Cost = cost, Profit = profit, BusinessType = 2 };
+                        var adskuGoi = new GOIByAdSku() { Sku = skuId, Cost = cost, Profit = profit, BusinessType = 2, Clicks = Convert.ToInt32(clicks) };
                         list.Add(adskuGoi);
                     }
                 }
@@ -245,8 +247,9 @@ namespace SiNan.Business
                     if (zntfCost != null || zntfProfit != null)
                     {
                         var cost = zntfCost?.Cost ?? 0M;
+                        var clicks = zntfCost?.Clicks ?? 0;
                         var profit = zntfProfit?.Profit ?? 0M;
-                        var adskuGoi = new GOIByAdSku() { Sku = skuId, Cost = cost, Profit = profit, BusinessType = 134217728 };
+                        var adskuGoi = new GOIByAdSku() { Sku = skuId, Cost = cost, Profit = profit, BusinessType = 134217728, Clicks = Convert.ToInt32(clicks) };
                         list.Add(adskuGoi);
                     }
                 }
diff --git a/SiNan.Model/Core/GOI/GOIByAdSku.cs b/SiNan.Model/Core/GOI/GOIByAdSku.cs
index 2e4ba74..dab91d1 100644
--- a/SiNan.Model/Core/GOI/GOIByAdSku.cs
+++ b/SiNan.Model/Core/GOI/GOIByAdSku.cs
@@ -3,5 +3,7 @@
     public class GOIByAdSku : GOIBySku
     {
         public int BusinessType { get; set; }
+
+        public int Clicks { get; set; }
     }
 }
diff --git a/SiNan.Model/Db/Aggregation/AggregationJDPopularizeAdSkuDaily.cs b/SiNan.Model/Db/Aggregation/AggregationJDPopularizeAdSkuDaily.cs
index 786e6d4..78b0bef 100644
--- a/SiNan.Model/Db/Aggregation/AggregationJDPopularizeAdSkuDaily.cs
+++ b/SiNan.Model/Db/Aggregation/AggregationJDPopularizeAdSkuDaily.cs
@@ -83,7 +83,10 @@ namespace SiNan.Model.Db
         /// 推广营业额(SKU实收)
         /// </summary>
         [Column(DbType = "decimal(18,2)")]
-        public decimal? PopularizeAmount { get; set; }=0.00M;
+        public decimal? PopularizeAmount { get; set; } = 0.00M;
+
+        [Column(DbType = "int")]
+        public int? Clicks { get; set; } = 0;
     }
 
 }