From d5e2eee528f41e17e4c02868f6cc669813c895e2 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 18 Jul 2023 17:29:06 +0800 Subject: [PATCH] 10129 --- .../APIServices/PurchaseProductAPIService.cs | 1 + BBWYB.Client/GlobalContext.cs | 2 +- .../APIModel/Response/PurchaseSchemeResponse.cs | 5 +++++ BBWYB.Client/Models/Product/Purchaser.cs | 2 ++ .../Models/PurchaseScheme/PurchaseScheme.cs | 1 + .../Ware/BindingPurchaseProductViewModel.cs | 8 +++++++- .../ViewModels/Ware/WareManagerViewModel.cs | 16 +++++++++++----- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/BBWYB.Client/APIServices/PurchaseProductAPIService.cs b/BBWYB.Client/APIServices/PurchaseProductAPIService.cs index f3ddb57..b5f42d4 100644 --- a/BBWYB.Client/APIServices/PurchaseProductAPIService.cs +++ b/BBWYB.Client/APIServices/PurchaseProductAPIService.cs @@ -195,6 +195,7 @@ namespace BBWYB.Client.APIServices var purchaser = new Purchaser() { Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(), + Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(), Name = jobject["globalData"]["tempModel"]["companyName"].ToString(), Location = jobject["data"]["1081181309101"] != null ? jobject["data"]["1081181309101"]["data"]["location"].ToString() : diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index 911130a..02ac109 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -20,7 +20,7 @@ namespace BBWYB.Client { public GlobalContext() { - BBWYBApiVersion = "10028"; + BBWYBApiVersion = "10029"; } private User user; diff --git a/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs b/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs index c44c023..b010fef 100644 --- a/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs @@ -15,6 +15,11 @@ namespace BBWYB.Client.Models /// 采购商Id /// public string PurchaserId { get; set; } + + /// + /// 采购商Id + /// + public string PurchaserId2 { get; set; } public string PurchaserName { get; set; } /// /// 发货地 diff --git a/BBWYB.Client/Models/Product/Purchaser.cs b/BBWYB.Client/Models/Product/Purchaser.cs index 9d0040d..0b021fb 100644 --- a/BBWYB.Client/Models/Product/Purchaser.cs +++ b/BBWYB.Client/Models/Product/Purchaser.cs @@ -11,6 +11,8 @@ namespace BBWYB.Client.Models public string Id { get; set; } + public string Id2 { get; set; } + public string Name { get; set; } /// diff --git a/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs b/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs index bb84ac1..3d5ad1c 100644 --- a/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs +++ b/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs @@ -22,6 +22,7 @@ namespace BBWYB.Client.Models public decimal RealCost { get => realCost; set { SetProperty(ref realCost, value); } } public string PurchaserId { get; set; } + public string PurchaserId2 { get; set; } public string PurchaserName { get; set; } public string PurchaserLocation { get; set; } public string PurchaseProductId1 { get; set; } diff --git a/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs b/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs index 2a8ec79..85775b6 100644 --- a/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs +++ b/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs @@ -35,6 +35,9 @@ namespace BBWYB.Client.ViewModels public IList ProductSkuList { get; set; } public string PurchaserId { get; set; } + + public string PurchaserId2 { get; set; } + public string PurchaserName { get => purchaserName; set { SetProperty(ref purchaserName, value); } } public string PurchaserLocation { get; set; } public bool IsLoading { get => isLoading; set { SetProperty(ref isLoading, value); } } @@ -85,11 +88,12 @@ namespace BBWYB.Client.ViewModels }; } - public void SetData(IList productSkuList, string purchaserId, string purchaserName, Platform purchasePlatform) + public void SetData(IList productSkuList, string purchaserId, string purchaserId2, string purchaserName, Platform purchasePlatform) { this.ProductSkuList = productSkuList; //this.Product = product; this.PurchaserId = purchaserId; + this.PurchaserId2 = purchaserId2; this.PurchaserName = purchaserName; this.PurchasePlatform = purchasePlatform; } @@ -177,6 +181,7 @@ namespace BBWYB.Client.ViewModels } PurchaserId = data.Value.purchaser.Id; + PurchaserId2 = data.Value.purchaser.Id2; PurchaserName = data.Value.purchaser.Name; PurchaserLocation = data.Value.purchaser.Location; @@ -315,6 +320,7 @@ namespace BBWYB.Client.ViewModels var productSku = ProductSkuList.FirstOrDefault(sku => sku.Id == purchaseSchemeProduct.SkuId); productSku.SelectedPurchaseScheme.PurchaserId = PurchaserId; + productSku.SelectedPurchaseScheme.PurchaserId2 = PurchaserId2; productSku.SelectedPurchaseScheme.PurchaserName = PurchaserName; productSku.SelectedPurchaseScheme.PurchaserLocation = PurchaserLocation; productSku.SelectedPurchaseScheme.DefaultCost = productSku.SelectedPurchaseScheme.PurchaseSchemeProductList.Sum(p => p.PurchaseSchemeProductSkuList.Count() == 0 ? 0 : p.PurchaseSchemeProductSkuList.Sum(s => s.Price)); diff --git a/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs b/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs index 78bbdc0..5661f0a 100644 --- a/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs +++ b/BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs @@ -242,7 +242,13 @@ namespace BBWYB.Client.ViewModels var purchaser = product.PurchaserList.FirstOrDefault(purchaser => purchaser.Id == pscheme.PurchaserId); if (purchaser == null) { - purchaser = new Purchaser() { Id = pscheme.PurchaserId, Name = pscheme.PurchaserName, ProductId = product.Id }; + purchaser = new Purchaser() + { + Id = pscheme.PurchaserId, + Id2 = pscheme.PurchaserId2, + Name = pscheme.PurchaserName, + ProductId = product.Id + }; product.PurchaserList.Add(purchaser); } purchaser.SkuUseCount++; @@ -260,13 +266,13 @@ namespace BBWYB.Client.ViewModels return; } - OpenBindingView(product, string.Empty, string.Empty); + OpenBindingView(product, string.Empty, string.Empty, string.Empty); } private void EditPurchaser(Purchaser purchaser) { var product = ProductList.FirstOrDefault(p => p.Id == purchaser.ProductId); - OpenBindingView(product, purchaser.Id, purchaser.Name); + OpenBindingView(product, purchaser.Id, purchaser.Id2, purchaser.Name); } private void DeletePurchaser(Purchaser purchaser) @@ -306,10 +312,10 @@ namespace BBWYB.Client.ViewModels }); } - private void OpenBindingView(Product product, string purchaserId, string purchaserName) + private void OpenBindingView(Product product, string purchaserId, string purchaserId2, string purchaserName) { var skuList = product.SkuList; - bindingPurchaseProduct.SetData(skuList, purchaserId, purchaserName, product.SelectedPurchasePlatformModel); + bindingPurchaseProduct.SetData(skuList, purchaserId, purchaserId2, purchaserName, product.SelectedPurchasePlatformModel); var bindingView = new BindingPurchaseProduct(); var r = bindingView.ShowDialog(); if (r == true)