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

SBF.Business/TrusteeshipBusiness.cs

@@ -98,6 +98,8 @@ namespace SBF.Business
                            .WhereIf(request.Stage != null, (t, p, ps) => p.Stage == request.Stage)
                            .WhereIf(!string.IsNullOrEmpty(request.Spu), (t, p, ps) => t.SpuId == request.Spu)
                            .WhereIf(!string.IsNullOrEmpty(request.Sku), (t, p, ps) => t.SkuId == request.Sku)
+                           .WhereIf(request.IsEnd == 1, (t, p, ps) => t.IsEnd == true)
+                           .WhereIf(request.IsEnd == 0, (t, p, ps) => t.IsEnd == false)
                            .WhereIf(!string.IsNullOrEmpty(request.Title), (t, p, ps) => p.Title.StartsWith(request.Title))
                            .OrderByDescending((t, p, ps) => t.CreateTime)
                            .Page(request.PageIndex, request.PageSize)
@@ -148,7 +150,7 @@ namespace SBF.Business
             var endDate = DateTime.Now.Date.AddDays(-1);
 
             var skuIdList = list.Select(x => x.SkuId).Distinct().ToList();
-            var spuIdList = list.Select(x => x.SpuId).Distinct().ToList();
+            //var spuIdList = list.Select(x => x.SpuId).Distinct().ToList();
 
 
             #region 推广花费
@@ -167,14 +169,14 @@ namespace SBF.Business
             #endregion
 
             #region 商品营业额
-            var actualAmountList = fsql.Select<AggregationJDPopularizeSpuDaily>()
+            var actualAmountList = fsql.Select<AggregationJDPopularizeSkuDaily>()
                                        .Where(x => x.ShopId == request.ShopId &&
                                                    x.Date >= startDate && x.Date <= endDate &&
-                                                   spuIdList.Contains(x.ProductId))
+                                                   skuIdList.Contains(x.SkuId))
                                        .ToList(x => new
                                        {
                                            x.Date,
-                                           x.ProductId,
+                                           x.SkuId,
                                            x.Cost,
                                            x.ActualAmount
                                        });
@@ -202,7 +204,7 @@ namespace SBF.Business
                                                   Value = x.Cost
                                               }).ToList();
 
-                task.ActualAmountByDateList = actualAmountList.Where(x => x.ProductId == task.SpuId)
+                task.ActualAmountByDateList = actualAmountList.Where(x => x.SkuId == task.SkuId)
                                              .OrderBy(x => x.Date)
                                              .Select(x => new NumberByDate()
                                              {

SBF.Model/Db/Aggregation/AggregationJDPopularizeSkuDaily.cs

@@ -61,6 +61,11 @@ namespace SBF.Model.Db
         [Column(StringLength = 50)]
         public string SkuId { get; set; }
 
+        /// <summary>
+        /// 商品营业额(SKU实收)
+        /// </summary>
+        [Column(DbType = "decimal(18,2)")]
+        public decimal? ActualAmount { get; set; } = 0.00M;
     }
 
 }

SBF.Model/Dto/Request/QueryTrusteeshipRequest.cs

@@ -9,6 +9,11 @@
         /// </summary>
         public int BusinessType { get; set; }
 
+        /// <summary>
+        /// 是否结束 1结束 0未结束 null两者都包含
+        /// </summary>
+        public int? IsEnd { get; set; }
+
         public long? ShopId { get; set; }
 
         public string Spu { get; set; }