From fc53ddf79f1bef5590a2ac6566d60f6c3cf9d9ab Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sat, 17 Dec 2022 01:52:51 +0800
Subject: [PATCH] 1

---
 .../PlatformSDK/JDBusiness.cs                 |  5 +++--
 BBWY.Server.Model/BBWY.Server.Model.csproj    |  1 +
 .../Product/SearchProductSkuRequest.cs        |  9 ++++++++-
 .../Dto/Response/Product/ProductResponse.cs   |  5 ++++-
 ...{ProductAPITest.cs => JDProductAPITest.cs} |  2 +-
 BBWY.Test/Program.cs                          | 20 ++++++++++++++-----
 6 files changed, 32 insertions(+), 10 deletions(-)
 rename BBWY.Test/{ProductAPITest.cs => JDProductAPITest.cs} (95%)

diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index 57699da6..d84ef6ed 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
@@ -120,7 +120,7 @@ namespace BBWY.Server.Business
             var req_skuList = new SkuReadSearchSkuListRequest()
             {
                 pageSize = 50,//50
-                field = "logo,saleAttrs,status,created"
+                field = "logo,saleAttrs,status,created,,barCode,categoryId,multiCateProps"
             };
 
             if (!string.IsNullOrEmpty(searchProductSkuRequest.Spu))
@@ -140,7 +140,8 @@ namespace BBWY.Server.Business
                 Title = s["saleAttrs"] != null ? string.Join("-", s["saleAttrs"].Select(a => a["attrValueAlias"][0].ToString())) : string.Empty,
                 Logo = $"https://img13.360buyimg.com/n9/s80x80_{s.Value<string>("logo")}",
                 State = s.Value<int>("status"),
-                CreateTime = s.Value<long>("created").StampToDateTime()
+                CreateTime = s.Value<long>("created").StampToDateTime(),
+                Source = searchProductSkuRequest.IsContainSource ? s : null
             }).ToList();
         }
 
diff --git a/BBWY.Server.Model/BBWY.Server.Model.csproj b/BBWY.Server.Model/BBWY.Server.Model.csproj
index c8dd518b..59de9e76 100644
--- a/BBWY.Server.Model/BBWY.Server.Model.csproj
+++ b/BBWY.Server.Model/BBWY.Server.Model.csproj
@@ -8,6 +8,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="FreeSql" Version="2.6.100" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BBWY.Server.Model/Dto/Request/Product/SearchProductSkuRequest.cs b/BBWY.Server.Model/Dto/Request/Product/SearchProductSkuRequest.cs
index 8189ca56..51212037 100644
--- a/BBWY.Server.Model/Dto/Request/Product/SearchProductSkuRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/Product/SearchProductSkuRequest.cs
@@ -1,4 +1,6 @@
-namespace BBWY.Server.Model.Dto
+using Newtonsoft.Json.Linq;
+
+namespace BBWY.Server.Model.Dto
 {
     public class SearchProductSkuRequest : PlatformRequest
     {
@@ -11,5 +13,10 @@
         /// 多个Sku逗号间隔
         /// </summary>
         public string Sku { get; set; }
+
+        /// <summary>
+        /// 是否包含源
+        /// </summary>
+        public bool IsContainSource { get; set; }
     }
 }
diff --git a/BBWY.Server.Model/Dto/Response/Product/ProductResponse.cs b/BBWY.Server.Model/Dto/Response/Product/ProductResponse.cs
index c8bc57b4..9a25de8f 100644
--- a/BBWY.Server.Model/Dto/Response/Product/ProductResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Product/ProductResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -57,6 +58,8 @@ namespace BBWY.Server.Model.Dto
         public int State { get; set; }
 
         public DateTime? CreateTime { get; set; }
+
+        public JToken? Source { get; set; }
     }
 
     public class SimpleProductSkuResponse
diff --git a/BBWY.Test/ProductAPITest.cs b/BBWY.Test/JDProductAPITest.cs
similarity index 95%
rename from BBWY.Test/ProductAPITest.cs
rename to BBWY.Test/JDProductAPITest.cs
index c5e24dc2..d9252936 100644
--- a/BBWY.Test/ProductAPITest.cs
+++ b/BBWY.Test/JDProductAPITest.cs
@@ -7,7 +7,7 @@ using System.Text;
 
 namespace BBWY.Test
 {
-    public class ProductAPITest
+    public class JDProductAPITest
     {
         public void GetSkus(IJdClient client, string token, string spu)
         {
diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs
index 8b8470e6..c62bc59b 100644
--- a/BBWY.Test/Program.cs
+++ b/BBWY.Test/Program.cs
@@ -14,14 +14,24 @@ namespace BBWY.Test
         {
             var appkey = "120EA9EC65AB017567D78CC1139EEEA5";
             var appSecret = "8a42bc2301e8439b896e99f5475e0a9b";
-            var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm";
+            //0e61c4a8ec3e4df4b5836e10884db9220yth 齐盛
+            //2ace3023200c4ea9aa682bbf8bffee18jztm 布莱特玩具
+            var token = "0e61c4a8ec3e4df4b5836e10884db9220yth"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"";
 
+
+            //10023500913672 含赠品SPU
+            //10022515718131 需要进行赠品上架的SPU
             IJdClient client = GetJdClient(appkey, appSecret);
-            // var test1 = new ProductAPITest();
-            //test1.GetSkus(client,token, "10023500913672");
+           var test1 = new JDProductAPITest();
+           test1.GetSkus(client,token, "10023500913672");
+
+
+            Console.WriteLine();
+
+            test1.GetSkus(client, token, "10022515718131");
 
-            var testService = new JDServiceAPITest();
-            testService.GetServiceDetail(client, token);
+            //var testService = new JDServiceAPITest();
+            //testService.GetServiceDetail(client, token);
 
             //var ddTest = new DingDingAPITest();
             //ddTest.Send();