10000

BBWYB.Client/APIServices/ProductService.cs

@@ -29,9 +29,9 @@ namespace BBWYB.Client.APIServices
                                                     HttpMethod.Post);
         }
 
-        public ApiResponse<IList<ProductSku>> GetProductSkuList(string spu, string sku)
+        public ApiResponse<ProductSkuListResponse> GetProductSkuList(string spu, string sku)
         {
-            return SendRequest<IList<ProductSku>>(globalContext.BBYWApiHost,
+            return SendRequest<ProductSkuListResponse>(globalContext.BBYWApiHost,
                                                   "api/product/GetProductSkuList",
                                                   new
                                                   {

BBWYB.Client/Models/APIModel/Response/Product/ProductSkuListResponse.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace BBWYB.Client.Models
+{
+    public class ProductSkuListResponse
+    {
+        public int Count { get; set; }
+
+        public IList<ProductSku> Items { get; set; }
+    }
+}

BBWYB.Client/Models/APIModel/Response/ServiceGroup/WaiterResponse.cs

@@ -1,11 +0,0 @@
-namespace BBWYB.Client.Models
-{
-    public class WaiterResponse
-    {
-        public string Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Level { get; set; }
-    }
-}

BBWYB.Client/Models/Product/Product.cs

@@ -56,7 +56,7 @@ namespace BBWYB.Client.Models
         public void CreatePlatformList()
         {
             PurchasePlatformList.Add(Platform.阿里巴巴);
-            PurchasePlatformList.Add(Platform.拳探);
+            //PurchasePlatformList.Add(Platform.拳探);
             SelectedPurchasePlatformModel = PurchasePlatformList[0];
         }
     }

BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs

@@ -111,7 +111,7 @@ namespace BBWYB.Client.ViewModels
                         IsLoading = false;
                         return;
                     }
-                    productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, pageIndex);
+                    productApiResponse = productService.GetProductList(skuResponse.Data.Items[0].ProductId, string.Empty, string.Empty, pageIndex);
                 }
                 else
                 {
@@ -183,7 +183,7 @@ namespace BBWYB.Client.ViewModels
                     App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
                     return;
                 }
-                product.SkuList = skuResponse.Data;
+                product.SkuList = skuResponse.Data.Items;
             }
             catch (Exception ex)
             {

BBWYB.Client/ViewModels/Ware/WareStockViewModel.cs

@@ -106,7 +106,7 @@ namespace BBWYB.Client.ViewModels
                         IsLoading = false;
                         return;
                     }
-                    productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, pageIndex);
+                    productApiResponse = productService.GetProductList(skuResponse.Data.Items[0].ProductId, string.Empty, string.Empty, pageIndex);
                 }
                 else
                 {
@@ -173,7 +173,7 @@ namespace BBWYB.Client.ViewModels
                     App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
                     return;
                 }
-                foreach (var sku in skuResponse.Data)
+                foreach (var sku in skuResponse.Data.Items)
                 {
                     sku.StorageList.Add(new StorageModel()
                     {
@@ -195,7 +195,7 @@ namespace BBWYB.Client.ViewModels
                     });
                     sku.SelectedStorageModel = sku.StorageList[0];
                 }
-                product.SkuList = skuResponse.Data;
+                product.SkuList = skuResponse.Data.Items;
             }
             catch (Exception ex)
             {

BBWYB.Server.API/Program.cs

@@ -51,11 +51,12 @@ services.AddMapper(new MappingProfiles());
 services.AddControllers(c =>
 {
     c.Filters.Add<ResultFilter>();
+    c.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true;
 }).AddNewtonsoftJson(setupAction =>
 {
     setupAction.SerializerSettings.ContractResolver = new DefaultContractResolver();
     setupAction.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
-    //setupAction.SerializerSettings.NullValueHandling = Newtonsoft.Json.NullValueHandling.Include;
+    //setupAction.SerializerSettings.NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore;
     //setupAction.SerializerSettings.DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Include;
 });
 

SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs

@@ -2,7 +2,6 @@
 {
     public class OP_SearchProductRequest : BasePlatformRequest
     {
-
         public string Spu { get; set; }
 
         /// <summary>