diff --git a/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs b/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs index 5103060d..97f5559e 100644 --- a/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs @@ -20,7 +20,7 @@ namespace BBWY.Client.Models public string AppToken { get; set; } - public IList PurchaseAccountList { get; set; } + public IList PurchaseList { get; set; } } public class PurchaseAccountResponse diff --git a/BBWY.Client/Models/MappingProfile.cs b/BBWY.Client/Models/MappingProfile.cs index d1b49a87..d9d6c71b 100644 --- a/BBWY.Client/Models/MappingProfile.cs +++ b/BBWY.Client/Models/MappingProfile.cs @@ -21,7 +21,8 @@ namespace BBWY.Client.Models CreateMap().ForMember(t => t.ShopId, opt => opt.MapFrom(f => f.ShopId)) .ForMember(t => t.Name, opt => opt.MapFrom(f => f.ShopName)) .ForMember(t => t.VenderType, opt => opt.MapFrom(f => f.ShopType)) - .ForMember(t => t.Platform, opt => opt.MapFrom(f => f.PlatformId)); + .ForMember(t => t.Platform, opt => opt.MapFrom(f => f.PlatformId)) + .ForMember(t => t.PurchaseAccountList, opt => opt.MapFrom(f => f.PurchaseList)); CreateMap(); CreateMap(); diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs index d38c7049..0de90c7e 100644 --- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs +++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs @@ -5,6 +5,7 @@ using BBWY.Common.Models; using GalaSoft.MvvmLight.Command; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Input; @@ -102,8 +103,21 @@ namespace BBWY.Client.ViewModels public void PreviewPurchase(PurchaseScheme purchaseScheme) { - var p = new _1688Purchase(this.OrderId, this.ItemTotal, purchaseScheme); - p.ShowDialog(); + var count = globalContext.User.Shop.PurchaseAccountList.Count(); + if (count > 1) + { + //选择采购账号 + } + else if (count == 1) + { + var p = new _1688Purchase(this.OrderId, this.ItemTotal, purchaseScheme, globalContext.User.Shop.PurchaseAccountList[0]); + p.ShowDialog(); + } + else + { + MessageBox.Show("缺少采购账号", "提示"); + return; + } } } } diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs index 53cb9f55..c746a27f 100644 --- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -16,6 +16,7 @@ namespace BBWY.Client.ViewModels public IList PurchaseSchemeProductSkuList { get; set; } public PurchaseScheme PurchaseScheme { get; set; } + public PurchaseAccount PurchaseAccount { get; set; } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } private string orderId; @@ -32,11 +33,12 @@ namespace BBWY.Client.ViewModels PurchaseSchemeProductSkuList = new ObservableCollection(); } - public void SetData(string orderId, int skuItemCount, PurchaseScheme purchaseScheme) + public void SetData(string orderId, int skuItemCount, PurchaseScheme purchaseScheme, PurchaseAccount purchaseAccount) { this.orderId = orderId; this.skuItemCount = skuItemCount; this.PurchaseScheme = purchaseScheme; + this.PurchaseAccount = purchaseAccount; } protected override void Load() @@ -153,7 +155,7 @@ namespace BBWY.Client.ViewModels private void OnDelayTriggerExecute(string key) { - + } } } diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs b/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs index ae6532ef..a6298977 100644 --- a/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs +++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs @@ -9,10 +9,10 @@ namespace BBWY.Client.Views.Purchase /// public partial class _1688Purchase : BWindow { - public _1688Purchase(string orderId, int skuItemCount, PurchaseScheme purchaseScheme) + public _1688Purchase(string orderId, int skuItemCount, PurchaseScheme purchaseScheme,PurchaseAccount purchaseAccount) { InitializeComponent(); - (this.DataContext as _1688PreviewPurchaseViewModel).SetData(orderId, skuItemCount, purchaseScheme); + (this.DataContext as _1688PreviewPurchaseViewModel).SetData(orderId, skuItemCount, purchaseScheme, purchaseAccount); } } }