From 71acf5c4c4d51bbd362c1c7e3b55491ca5419c94 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 11 Mar 2023 11:56:57 +0800 Subject: [PATCH] 10000 --- BBWYB.Client/APIServices/ProductService.cs | 4 ++-- .../Response/{ => Product}/ProductListResponse.cs | 0 .../Response/Product/ProductSkuListResponse.cs | 11 +++++++++++ .../APIModel/Response/ServiceGroup/WaiterResponse.cs | 11 ----------- BBWYB.Client/Models/Product/Product.cs | 2 +- BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs | 4 ++-- BBWYB.Client/ViewModels/Ware/WareStockViewModel.cs | 6 +++--- BBWYB.Server.API/Program.cs | 3 ++- .../Models/Request/OP_SearchProductRequest.cs | 1 - 9 files changed, 21 insertions(+), 21 deletions(-) rename BBWYB.Client/Models/APIModel/Response/{ => Product}/ProductListResponse.cs (100%) create mode 100644 BBWYB.Client/Models/APIModel/Response/Product/ProductSkuListResponse.cs delete mode 100644 BBWYB.Client/Models/APIModel/Response/ServiceGroup/WaiterResponse.cs diff --git a/BBWYB.Client/APIServices/ProductService.cs b/BBWYB.Client/APIServices/ProductService.cs index 0de5eb7..4062c4f 100644 --- a/BBWYB.Client/APIServices/ProductService.cs +++ b/BBWYB.Client/APIServices/ProductService.cs @@ -29,9 +29,9 @@ namespace BBWYB.Client.APIServices HttpMethod.Post); } - public ApiResponse> GetProductSkuList(string spu, string sku) + public ApiResponse GetProductSkuList(string spu, string sku) { - return SendRequest>(globalContext.BBYWApiHost, + return SendRequest(globalContext.BBYWApiHost, "api/product/GetProductSkuList", new { diff --git a/BBWYB.Client/Models/APIModel/Response/ProductListResponse.cs b/BBWYB.Client/Models/APIModel/Response/Product/ProductListResponse.cs similarity index 100% rename from BBWYB.Client/Models/APIModel/Response/ProductListResponse.cs rename to BBWYB.Client/Models/APIModel/Response/Product/ProductListResponse.cs diff --git a/BBWYB.Client/Models/APIModel/Response/Product/ProductSkuListResponse.cs b/BBWYB.Client/Models/APIModel/Response/Product/ProductSkuListResponse.cs new file mode 100644 index 0000000..982673d --- /dev/null +++ b/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 Items { get; set; } + } +} diff --git a/BBWYB.Client/Models/APIModel/Response/ServiceGroup/WaiterResponse.cs b/BBWYB.Client/Models/APIModel/Response/ServiceGroup/WaiterResponse.cs deleted file mode 100644 index 9d4d7a0..0000000 --- a/BBWYB.Client/Models/APIModel/Response/ServiceGroup/WaiterResponse.cs +++ /dev/null @@ -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; } - } -} diff --git a/BBWYB.Client/Models/Product/Product.cs b/BBWYB.Client/Models/Product/Product.cs index d2d0542..d66bc47 100644 --- a/BBWYB.Client/Models/Product/Product.cs +++ b/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]; } } diff --git a/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs b/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs index 9c9efab..c0d4a14 100644 --- a/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs +++ b/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) { diff --git a/BBWYB.Client/ViewModels/Ware/WareStockViewModel.cs b/BBWYB.Client/ViewModels/Ware/WareStockViewModel.cs index 0c1c829..fd57748 100644 --- a/BBWYB.Client/ViewModels/Ware/WareStockViewModel.cs +++ b/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) { diff --git a/BBWYB.Server.API/Program.cs b/BBWYB.Server.API/Program.cs index 65fb3d4..0908175 100644 --- a/BBWYB.Server.API/Program.cs +++ b/BBWYB.Server.API/Program.cs @@ -51,11 +51,12 @@ services.AddMapper(new MappingProfiles()); services.AddControllers(c => { c.Filters.Add(); + 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; }); diff --git a/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs index b141648..4ff70ef 100644 --- a/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs +++ b/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs @@ -2,7 +2,6 @@ { public class OP_SearchProductRequest : BasePlatformRequest { - public string Spu { get; set; } ///