diff --git a/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs b/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs index 5fccbf2..673dfb4 100644 --- a/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs +++ b/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs @@ -227,7 +227,7 @@ namespace BBWYB.Server.Business #endregion #region 最近采购的店铺商品 - var recent30d = DateTime.Now.AddDays(-30); + var recent30d = DateTime.Now.AddDays(-00); var bePurchasedProductSkuList = fsql.Select() .InnerJoin((opi, opri, o, ps) => opi.OrderId == o.Id) .InnerJoin((opi, opri, o, ps) => opri.PurchaseOrderId == opi.PurchaseOrderId) @@ -237,18 +237,21 @@ namespace BBWYB.Server.Business opi.IsEnabled == true && opi.CreateTime >= recent30d && purchaserIdList.Contains(opi.PurchaserId)) - .OrderByDescending((opi, opri, o, ps) => opi.CreateTime) - .ToList((opi, opri, o, ps) => new + .GroupBy((opi, opri, o, ps) => new { - opi.PurchaserId, ps.Id, + opi.PurchaserId, ps.Logo, ps.SkuName, - //ps.Price, - opi.PurchaseOrderId, - opi.OrderId, - opi.CreateTime, opri.SourceSkuId + }) + .ToList(g => new + { + g.Key.Id, + g.Key.PurchaserId, + g.Key.Logo, + g.Key.SkuName, + g.Key.SourceSkuId }); @@ -305,9 +308,7 @@ namespace BBWYB.Server.Business Id = x.Id, Logo = x.Logo, SkuName = x.SkuName, - BelongSku = x.SourceSkuId, - OrderId = x.OrderId, - PurchaserOrderId = x.PurchaseOrderId + BelongSku = x.SourceSkuId }).ToList(); #endregion diff --git a/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs index dd29ac5..0d4d2f0 100644 --- a/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs @@ -15,15 +15,5 @@ /// 归属SkuId(JD) /// public string BelongSku { get; set; } - - /// - /// 采购单号 - /// - public string PurchaserOrderId { get; set; } - - /// - /// 订单Id - /// - public string OrderId { get; set; } } }