From dba5812db21c1b76473aa6425b25c77637b9a6bf Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 3 Dec 2023 09:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=BB=E5=8A=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SBF.Business/TrusteeshipBusiness.cs           | 14 +++---
 .../Dto/Response/TrusteeshipTaskResponse.cs   | 49 +++++++++++++++++--
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/SBF.Business/TrusteeshipBusiness.cs b/SBF.Business/TrusteeshipBusiness.cs
index 3523853..37fd0d5 100644
--- a/SBF.Business/TrusteeshipBusiness.cs
+++ b/SBF.Business/TrusteeshipBusiness.cs
@@ -91,6 +91,8 @@ namespace SBF.Business
         {
             if (request.ShopId == null || request.ShopId == 0)
                 throw new BusinessException("缺少ShopId");
+            if (request.PageSize > 20)
+                request.PageSize = 20;
 
             var list = fsql.Select<Sbf_TrusteeshipTask, Product, ProductSku>()
                            .InnerJoin((t, p, ps) => t.SpuId == p.Id)
@@ -403,12 +405,12 @@ namespace SBF.Business
                                               Value = x.Cost
                                           }).ToList();
 
-            task.PopluarizeProfitByDateList = costList.OrderBy(x => x.Date)
-                                                      .Select(x => new NumberByDate()
-                                                      {
-                                                          Date = x.Date,
-                                                          Value = x.PopularizeLevelProfit - x.Cost
-                                                      }).ToList();
+            task.PopluarizeNetProfitByDateList = costList.OrderBy(x => x.Date)
+                                                         .Select(x => new NumberByDate()
+                                                         {
+                                                             Date = x.Date,
+                                                             Value = x.PopularizeLevelProfit - x.Cost
+                                                         }).ToList();
 
             task.ActualAmountByDateList = actualAmountList.OrderBy(x => x.Date)
                                                           .Select(x => new NumberByDate()
diff --git a/SBF.Model/Dto/Response/TrusteeshipTaskResponse.cs b/SBF.Model/Dto/Response/TrusteeshipTaskResponse.cs
index 2721281..3492484 100644
--- a/SBF.Model/Dto/Response/TrusteeshipTaskResponse.cs
+++ b/SBF.Model/Dto/Response/TrusteeshipTaskResponse.cs
@@ -93,22 +93,63 @@ namespace SBF.Model.Dto
         /// <summary>
         /// 按日期分组的推广盈利
         /// </summary>
-        public IList<NumberByDate> PopluarizeProfitByDateList { get; set; }
+        public IList<NumberByDate> PopluarizeNetProfitByDateList { get; set; }
+
 
         /// <summary>
         /// 按日期分组的推广毛利
         /// </summary>
-        public IList<NumberByDate> PopluarizeGrossProfitByDateList { get; set; }
+        public IList<NumberByDate> PopluarizeProfitByDateList { get; set; }
 
         /// <summary>
         /// 按日期分组的商品毛利
         /// </summary>
-        public IList<NumberByDate> ProductGrossProfitByDateList { get; set; }
+        public IList<NumberByDate> ProductProfitByDateList { get; set; }
 
         /// <summary>
         /// 按日期分组的商品盈利
         /// </summary>
-        public IList<NumberByDate> ProductProfitByDateList { get; set; }
+        public IList<NumberByDate> ProductNetProfitByDateList { get; set; }
+
+        /// <summary>
+        /// 最近7天商品GOI
+        /// </summary>
+        public decimal? Recent7dProductLevelGOI { get; set; }
+
+        /// <summary>
+        /// 最近7天推广GOI
+        /// </summary>
+        public decimal? Recent7dPopluarizeLevelGOI { get; set; }
+
+        /// <summary>
+        /// 最近30天商品GOI
+        /// </summary>
+        public decimal? Recent30dProductLevelGOI { get; set; }
+
+        /// <summary>
+        /// 最近30天推广GOI
+        /// </summary>
+        public decimal? Recent30dPopluarizeLevelGOI { get; set; }
+
+        /// <summary>
+        /// 最近30天推广成本
+        /// </summary>
+        public decimal? Recent30dCost { get; set; }
+
+        /// <summary>
+        /// 最近30天推广毛利
+        /// </summary>
+        public decimal? Recent30dPopluarizeLevelProfit { get; set; }
+
+        /// <summary>
+        /// 最近30天商品毛利
+        /// </summary>
+        public decimal? Recent30dProductLevelProfit { get; set; }
+
+        /// <summary>
+        /// 最近30天商品盈利
+        /// </summary>
+        public decimal? Recent30dProductLevelNetProfit { get; set; }
 
         /// <summary>
         /// 托管开始时间