diff --git a/BBWY.Client/Models/Product/Purchaser.cs b/BBWY.Client/Models/Product/Purchaser.cs index c10a6f6d..21ab7466 100644 --- a/BBWY.Client/Models/Product/Purchaser.cs +++ b/BBWY.Client/Models/Product/Purchaser.cs @@ -20,6 +20,6 @@ public string Location { get; set; } - //public Platform Platform { get; set; } + public Platform Platform { get; set; } } } diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs index 9eab7d00..7a8e41fa 100644 --- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs +++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs @@ -103,23 +103,17 @@ namespace BBWY.Client.ViewModels public void PreviewPurchase(Purchaser purchaser) { - var count = globalContext.User.Shop.PurchaseAccountList == null ? 0 : globalContext.User.Shop.PurchaseAccountList.Count(); - if (count > 1) + var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(pa => pa.PurchasePlatformId == purchaser.Platform); + if (purchaseAccount == null) { - //选择采购账号 - //验证采购账号的所属平台 - } - else if (count == 1) - { - var p = new _1688Purchase(order, purchaser, globalContext.User.Shop.PurchaseAccountList[0]); - p.ShowDialog(); - GalaSoft.MvvmLight.Messaging.Messenger.Default.Send(null, "ChoosePurchaseScheme_Close"); - } - else - { - MessageBox.Show("缺少采购账号", "提示"); + MessageBox.Show($"缺少{purchaser.Platform}的采购账号", "提示"); return; } + + var p = new _1688Purchase(order, purchaser, purchaseAccount); + p.ShowDialog(); + GalaSoft.MvvmLight.Messaging.Messenger.Default.Send(null, "ChoosePurchaseScheme_Close"); + } } }