From 7048eea6829a9c0ed536b06cb4f451de559d21d0 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 29 Dec 2023 02:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD=E5=95=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Purchaser/PurchaserBusiness.cs            | 23 ++++++++++---------
 .../Product/RecentPurchasedSkuResponse.cs     | 10 --------
 2 files changed, 12 insertions(+), 21 deletions(-)

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<OrderPurchaseInfo, OrderPurchaseRelationInfo, Order, ProductSku>()
                                                     .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）
         /// </summary>
         public string BelongSku { get; set; }
-
-        /// <summary>
-        /// 采购单号
-        /// </summary>
-        public string PurchaserOrderId { get; set; }
-
-        /// <summary>
-        /// 订单Id
-        /// </summary>
-        public string OrderId { get; set; }
     }
 }