From 20661c09cfd6bf432bb1c3404fc90ea46944a702 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 28 Dec 2023 15:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9EJDSKU?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Purchaser/PurchaserBusiness.cs            | 13 ++++++---
 .../Product/RecentPurchasedSkuResponse.cs     | 29 +++++++++++++++++++
 .../Response/Purchaser/PurchaserResponse.cs   |  4 +--
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs

diff --git a/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs b/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs
index 434ccd9..93122bb 100644
--- a/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs
+++ b/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs
@@ -241,8 +241,11 @@ namespace BBWYB.Server.Business
                                                         ps.Id,
                                                         ps.Logo,
                                                         ps.SkuName,
-                                                        ps.Price,
-                                                        opi.CreateTime
+                                                        //ps.Price,
+                                                        opi.PurchaseOrderId,
+                                                        opi.OrderId,
+                                                        opi.CreateTime,
+                                                        opri.SourceSkuId
                                                     });
 
 
@@ -294,12 +297,14 @@ namespace BBWYB.Server.Business
                     #endregion
 
                     #region 最近采购店铺商品
-                    purchaser.Recent30dProductSku = bePurchasedProductSkuList.Where(x => x.PurchaserId == purchaser.Id).Take(10).Select(x => new ProductSkuResponse()
+                    purchaser.Recent30dProductSku = bePurchasedProductSkuList.Where(x => x.PurchaserId == purchaser.Id).Take(10).Select(x => new RecentPurchasedSkuResponse()
                     {
                         Id = x.Id,
                         Logo = x.Logo,
                         SkuName = x.SkuName,
-                        Price = x.Price
+                        BelongSku = x.SourceSkuId,
+                        OrderId = x.OrderId,
+                        PurchaserOrderId = x.PurchaseOrderId
                     }).ToList();
                     #endregion
 
diff --git a/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs
new file mode 100644
index 0000000..dd29ac5
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Response/Product/RecentPurchasedSkuResponse.cs
@@ -0,0 +1,29 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class RecentPurchasedSkuResponse
+    {
+        /// <summary>
+        /// SkuId
+        /// </summary>
+        public string Id { get; set; }
+
+        public string SkuName { get; set; }
+
+        public string Logo { get; set; }
+
+        /// <summary>
+        /// 归属SkuId（JD）
+        /// </summary>
+        public string BelongSku { get; set; }
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaserOrderId { get; set; }
+
+        /// <summary>
+        /// 订单Id
+        /// </summary>
+        public string OrderId { get; set; }
+    }
+}
diff --git a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
index f0df51f..1a573f9 100644
--- a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
@@ -52,13 +52,13 @@ namespace BBWYB.Server.Model.Dto
         /// <summary>
         /// 最近30天具有采购行为的店铺SKU
         /// </summary>
-        public IList<ProductSkuResponse> Recent30dProductSku { get; set; }
+        public IList<RecentPurchasedSkuResponse> Recent30dProductSku { get; set; }
 
         public PurchaserResponse()
         {
             CategoryList = new List<PurchaserExtendedInfoResponse>();
             TagList = new List<PurchaserExtendedInfoResponse>();
-            Recent30dProductSku = new List<ProductSkuResponse>();
+            Recent30dProductSku = new List<RecentPurchasedSkuResponse>();
         }
     }
 }