完善新建采购单

BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs

@@ -33,7 +33,7 @@ namespace BBWY.Client.Models
 
         public string PurchaserId { get; set; }
 
-        public string PurchaseName { get; set; }
+        public string PurchaserName { get; set; }
 
         public Platform? PurchasePlatform { get; set; }
     }

BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs

@@ -34,7 +34,7 @@ namespace BBWY.Client.Models
 
         public string PurchaserId { get; set; }
 
-        public string PurchaseName { get; set; }
+        public string PurchaserName { get; set; }
 
         public Platform? PurchasePlatform { get; set; }
 

BBWY.Client/ViewModels/BaseVM.cs

@@ -2,6 +2,8 @@
 using GalaSoft.MvvmLight.Command;
 using System.Windows.Input;
 using System;
+using System.Windows;
+
 namespace BBWY.Client.ViewModels
 {
     public class BaseVM : ViewModelBase
@@ -12,11 +14,27 @@ namespace BBWY.Client.ViewModels
 
         public ICommand UnloadCommand { get; set; }
 
+        public ICommand CopyTextCommand { get; set; }
+
         public BaseVM()
         {
             VMId = Guid.NewGuid();
             LoadCommand = new RelayCommand(Load);
             UnloadCommand = new RelayCommand(Unload);
+
+            CopyTextCommand = new RelayCommand<string>(s => 
+            {
+                try
+                {
+                    Clipboard.SetText(s);
+                }
+                catch (Exception ex)
+                {
+                    Console.ForegroundColor = ConsoleColor.Red;
+                    Console.WriteLine(ex);
+                    Console.ResetColor();
+                }
+            });
         }
 
         public virtual void Refresh()

BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs

@@ -116,7 +116,7 @@ namespace BBWY.Client.ViewModels
 
                 #region 提取采购商
                 var purchaserList = list.Where(item => item.PurchaseSchemeId != 0)
-                                        .Select(item => new Purchaser() { Id = item.PurchaserId, Name = item.PurchaseName, Platform = item.PurchasePlatform.Value })
+                                        .Select(item => new Purchaser() { Id = item.PurchaserId, Name = item.PurchaserName, Platform = item.PurchasePlatform.Value })
                                         .Distinct(new PurchaserComparer());
                 #endregion
 

BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs

@@ -1,11 +1,13 @@
 using BBWY.Client.APIServices;
 using BBWY.Client.Models;
 using BBWY.Client.Views.BatchPurchase;
+using BBWY.Common.Trigger;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
@@ -14,7 +16,10 @@ namespace BBWY.Client.ViewModels
 {
     public class BatchPurchaseCreateNewOrderViewModel : BaseVM
     {
+        private GlobalContext globalContext;
         private PurchaseProductAPIService purchaseProductAPIService;
+        private PurchaseService purchaseService;
+        private DelayTrigger delayTrigger;
 
         private bool isLoading;
         private decimal productAmount;
@@ -58,14 +63,19 @@ namespace BBWY.Client.ViewModels
         public ICommand PreviewOrderCommand { get; set; }
         public ICommand AddProductSkuCommand { get; set; }
 
-        public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService)
+        public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService, PurchaseService purchaseService, GlobalContext globalContext)
         {
+            this.globalContext = globalContext;
             this.purchaseProductAPIService = purchaseProductAPIService;
+            this.purchaseService = purchaseService;
             ProductSkuWithSchemeList = new ObservableCollection<ProductSkuWithScheme>();
 
             FastCreateOrderCommand = new RelayCommand(FastCreateOrder);
             PreviewOrderCommand = new RelayCommand(PreviewOrder);
             AddProductSkuCommand = new RelayCommand(AddProductSku);
+
+            this.delayTrigger = new DelayTrigger();
+            this.delayTrigger.OnExecute = OnDelayTriggerExecute;
         }
 
         private void OnDelayTriggerExecute(string key)
@@ -88,6 +98,7 @@ namespace BBWY.Client.ViewModels
                 return;
             }
 
+            IsLoading = false;
             //IsLoading = true;
             //Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
             //{
@@ -190,11 +201,88 @@ namespace BBWY.Client.ViewModels
         private void AddProductSku()
         {
             var addProductSkuWindow = new BatchPurchaseAddProductSku();
-            if (addProductSkuWindow.ShowDialog() == true)
+            if (addProductSkuWindow.ShowDialog() != true)
+                return;
+
+            var newProductSkuWithSchemeList = addProductSkuWindow.SelectedProductSkuWithSchemeList;
+            var waitList = new List<EventWaitHandle>();
+            foreach (var newProductSkuWithScheme in newProductSkuWithSchemeList)
+            {
+                if (ProductSkuWithSchemeList.Any(item => item.SkuId == newProductSkuWithScheme.SkuId))
+                    continue;
+                ProductSkuWithSchemeList.Add(newProductSkuWithScheme);
+                var ewh = new ManualResetEvent(false);
+                waitList.Add(ewh);
+                Task.Factory.StartNew(() => LoadPurchaseScheme(newProductSkuWithScheme, ewh));
+            }
+            if (waitList.Count() == 0)
+                return;
+            IsLoading = true;
+            Task.Factory.StartNew(() =>
+            {
+                WaitHandle.WaitAll(waitList.ToArray());
+                PreviewOrder(); //预览订单
+            });
+        }
+
+        private void LoadPurchaseScheme(ProductSkuWithScheme productSkuWithScheme, EventWaitHandle ewh)
+        {
+            try
+            {
+                #region 加载采购方案
+                var purchaseSchemeResponse = purchaseService.GetPurchaseSchemeList(shopId: globalContext.User.Shop.ShopId, schemeId: productSkuWithScheme.PurchaseSchemeId);
+                if (!purchaseSchemeResponse.Success)
+                {
+                    App.Current.Dispatcher.Invoke(() => MessageBox.Show($"方案Id{productSkuWithScheme.PurchaseSchemeId}\r\n{purchaseSchemeResponse.Msg}", "加载采购方案失败"));
+                    return;
+                }
+
+                var purchaseScheme = purchaseSchemeResponse.Data[0];
+                #endregion
+
+                #region 完善采购方案基本信息
+                foreach (var purchaseSchemeProduct in purchaseScheme.PurchaseSchemeProductList)
+                {
+                    var data = purchaseProductAPIService.GetProductInfo(productSkuWithScheme.PurchasePlatform.Value,
+                                                                        productSkuWithScheme.ProductId,
+                                                                        productSkuWithScheme.SkuId,
+                                                                        purchaseSchemeProduct.PurchaseProductId,
+                                                                        PurchaseOrderMode.批发,
+                                                                        PurchaseProductAPIMode.Spider);
+
+                    if (data != null && data.Value.purchaseSchemeProductSkus != null && data.Value.purchaseSchemeProductSkus.Count > 0)
+                    {
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            foreach (var purchaseSchemeProductSku in data.Value.purchaseSchemeProductSkus)
+                            {
+                                if (purchaseSchemeProduct.PurchaseSchemeProductSkuList.Any(s => s.PurchaseSkuId == purchaseSchemeProductSku.PurchaseSkuId))
+                                {
+                                    productSkuWithScheme.PurchaseSchemeProductSkuList.Add(purchaseSchemeProductSku);
+
+                                    purchaseSchemeProductSku.ItemTotal = productSkuWithScheme.Quantity;
+                                    purchaseSchemeProductSku.OnItemTotalChanged = OnItemTotalChanged;
+                                }
+                            }
+                        });
+                    }
+                }
+                #endregion
+            }
+            catch
             {
-                var newProductSkuWithSchemeList = addProductSkuWindow.SelectedProductSkuWithSchemeList;
 
             }
+            finally
+            {
+                ewh.Set();
+            }
+        }
+
+        private void OnItemTotalChanged(int itemTotal)
+        {
+            Console.WriteLine($"OnItemTotalChanged {DateTime.Now} {itemTotal}");
+            this.delayTrigger.SetKey(Guid.NewGuid().ToString());
         }
     }
 }

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -105,8 +105,6 @@ namespace BBWY.Client.ViewModels
 
         public ICommand ExportCommand { get; set; }
 
-        public ICommand CopyTextCommand { get; set; }
-
         public ICommand CopyOrderWaybillCommand { get; set; }
 
         public ICommand SetSearchDateCommand { get; set; }
@@ -191,20 +189,6 @@ namespace BBWY.Client.ViewModels
                 Task.Factory.StartNew(() => LoadOrder(1));  //手动点击查询订单
             });
             SyncOrderCommand = new RelayCommand(SyncOrder);
-            CopyTextCommand = new RelayCommand<string>(s =>
-            {
-                try
-                {
-                    Clipboard.SetText(s);
-                }
-                catch (Exception ex)
-                {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine(ex);
-                    Console.ResetColor();
-                }
-            }
-            );
             CopyOrderWaybillCommand = new RelayCommand<Order>(o => Clipboard.SetText(o.WaybillNo));
             SetSearchDateCommand = new RelayCommand<int>(d =>
             {

BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml

@@ -25,60 +25,174 @@
                 Background="{StaticResource Border.Background}">
             <TextBlock Text="新建采购单" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         </Border>
+        <Grid Margin="5" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="100"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
 
-        <ScrollViewer Grid.Row="1" Margin="0,5" FocusVisualStyle="{x:Null}">
+            <Border Background="{StaticResource Border.Background}"
-            <Grid Margin="5,0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="100"/>
-                    <RowDefinition Height="auto"/>
-                </Grid.RowDefinitions>
-
-                <Border Background="{StaticResource Border.Background}"
                         BorderThickness="1"
                         BorderBrush="{StaticResource Border.Brush}"
                         SnapsToDevicePixels="True"
                         UseLayoutRounding="True">
-                    <Grid>
+                <Grid>
-                        <Grid.ColumnDefinitions>
+                    <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="380"/>
+                        <ColumnDefinition Width="380"/>
-                            <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="80"/>
-                        </Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
-                        <TextBlock Text="店铺商品信息" Style="{StaticResource middleTextBlock}"/>
+                    </Grid.ColumnDefinitions>
-                        <TextBlock Text="采购商品信息" Style="{StaticResource middleTextBlock}" Grid.Column="1"/>
+                    <TextBlock Text="店铺商品信息" Style="{StaticResource middleTextBlock}"/>
-                        <TextBlock Text="单价" Style="{StaticResource middleTextBlock}" Grid.Column="2"/>
+                    <TextBlock Text="采购商品信息" Style="{StaticResource middleTextBlock}" Grid.Column="1"/>
-                        <TextBlock Text="数量" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
+
-                        <TextBlock Text="金额" Style="{StaticResource middleTextBlock}" Grid.Column="4"/>
+                    <TextBlock Text="组合配置" Style="{StaticResource middleTextBlock}" Grid.Column="2"/>
-
+                    <TextBlock Text="数量" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
-                        <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                    <TextBlock Text="单价" Style="{StaticResource middleTextBlock}" Grid.Column="4"/>
-                        <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+                    <TextBlock Text="总额" Style="{StaticResource middleTextBlock}" Grid.Column="5"/>
-                        <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+
-                        <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
-                    </Grid>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
-                </Border>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
-
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
-                <ListBox Grid.Row="1"
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
-                         Style="{StaticResource NoScrollViewListBoxStyle}"
+                </Grid>
-                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+            </Border>
-                         BorderThickness="1,0,1,1"
+
-                         BorderBrush="{StaticResource Border.Brush}">
+            <ListBox x:Name="listbox_ProductSkuWithSchemeList" Grid.Row="1"
-                    
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
-                </ListBox>
+                     BorderThickness="1,0,1,1"
-
+                     BorderBrush="{StaticResource Border.Brush}"
-                <Border Grid.Row="2" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,0,1,1">
+                     ItemsSource="{Binding ProductSkuWithSchemeList}">
-                    <c:BButton Style="{StaticResource LinkButton}" Command="{Binding AddProductSkuCommand}">
+                <ListBox.ItemTemplate>
-                        <StackPanel>
+                    <DataTemplate>
-                            <Path Style="{StaticResource path_add}" Fill="{StaticResource Text.Link.Color}" Width="18"/>
+                        <Grid Width="{Binding ActualWidth,ElementName=listbox_ProductSkuWithSchemeList}">
-                            <TextBlock Text="添加商品" Margin="0,2,0,0"/>
+                            <Grid.ColumnDefinitions>
-                        </StackPanel>
+                                <ColumnDefinition Width="380"/>
-                    </c:BButton>
+                                <ColumnDefinition Width="1*"/>
-                </Border>
+                            </Grid.ColumnDefinitions>
-            </Grid>
+                            <Grid>
-        </ScrollViewer>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+
+                                <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="0,5,0,0"
+                                                           Cursor="Hand"/>
+
+                                <StackPanel Grid.Column="1" Orientation="Vertical" VerticalAlignment="Top" Margin="0,5,0,0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="SKU:"/>
+                                        <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                    </StackPanel>
+                                    <TextBlock TextTrimming="CharacterEllipsis"
+                                               Margin="0,17,0,0">
+                                           <Run Text="名称:"/>
+                                           <Run Text="{Binding Title}"/>
+                                        <TextBlock.ToolTip>
+                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                <TextBlock Text="{Binding Title}"/>
+                                            </ToolTip>
+                                        </TextBlock.ToolTip>
+                                    </TextBlock>
+                                    <StackPanel Orientation="Horizontal" Margin="0,17,0,0">
+                                        <TextBlock>
+                                            <Run Text="单价:"/>
+                                            <Run Text="{Binding Price}"/>
+                                        </TextBlock>
+                                        <TextBlock Margin="10,0,0,0">
+                                            <Run Text="数量:"/>
+                                            <Run Text="{Binding Quantity}"/>
+                                        </TextBlock>
+                                    </StackPanel>
+
+                                </StackPanel>
+                            </Grid>
+
+                            <ListBox x:Name="listbox_PurchaseSchemeProductSkuList" Grid.Column="1"
+                                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                                     Style="{StaticResource NoScrollViewListBoxStyle}"
+                                     ItemsSource="{Binding PurchaseSchemeProductSkuList}">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Width="{Binding ActualWidth,ElementName=listbox_PurchaseSchemeProductSkuList}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="80"/>
+                                                <ColumnDefinition Width="80"/>
+                                                <ColumnDefinition Width="80"/>
+                                                <ColumnDefinition Width="80"/>
+                                            </Grid.ColumnDefinitions>
+
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="90"/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+
+                                                <c:BAsyncImage UrlSource="{Binding Logo}"
+                                                           Width="80" DecodePixelWidth="80"
+                                                           VerticalAlignment="Top" Margin="0,5,0,0"
+                                                           Cursor="Hand"/>
+
+                                                <StackPanel Grid.Column="1" Orientation="Vertical" VerticalAlignment="Top" Margin="0,5,0,0">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <TextBlock Text="SKU:"/>
+                                                        <c:BButton Content="{Binding PurchaseSkuId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                                                   CommandParameter="{Binding PurchaseSkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                    </StackPanel>
+                                                    <TextBlock TextTrimming="CharacterEllipsis"
+                                                               Margin="0,17,0,0">
+                                                               <Run Text="名称:"/>
+                                                               <Run Text="{Binding Title}"/>
+                                                        <TextBlock.ToolTip>
+                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                <TextBlock Text="{Binding Title}"/>
+                                                            </ToolTip>
+                                                        </TextBlock.ToolTip>
+                                                    </TextBlock>
+                                                    <StackPanel Orientation="Horizontal" Margin="0,17,0,0">
+                                                        <TextBlock>
+                                                            <Run Text="采购平台:"/>
+                                                            <Run Text="{Binding DataContext.PurchasePlatform,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
+                                                        </TextBlock>
+                                                        <TextBlock Margin="10,0,0,0">
+                                                            <Run Text="采购商:"/>
+                                                            <Run Text="{Binding DataContext.PurchaserName,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
+                                                        </TextBlock>
+                                                    </StackPanel>
+
+                                                </StackPanel>
+                                            </Grid>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <Border Grid.Row="2" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,0,1,1">
+                <c:BButton Style="{StaticResource LinkButton}" Command="{Binding AddProductSkuCommand}">
+                    <StackPanel>
+                        <Path Style="{StaticResource path_add}" Fill="{StaticResource Text.Link.Color}" Width="18"/>
+                        <TextBlock Text="添加商品" Margin="0,2,0,0"/>
+                    </StackPanel>
+                </c:BButton>
+            </Border>
+        </Grid>
 
         <Grid Grid.Row="2" Margin="5,0">
             <Grid.ColumnDefinitions>
@@ -111,7 +225,7 @@
                 <Run Text="元"/>
                 </TextBlock>
             </StackPanel>
-           
+
         </Grid>
 
         <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Grid.Row="3" Margin="5,0">

BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml

@@ -106,20 +106,25 @@
                                                            Cursor="Hand"/>
 
                                 <StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,5,0,5">
-                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                    <StackPanel Orientation="Horizontal">
-                                        <Run Text="SKU:"/>
+                                        <TextBlock Text="SKU:"/>
-                                        <Run Text="{Binding SkuId}"/>
+                                        <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}"
-                                    </TextBlock>
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,0"
+                                                   DisableText="{Binding SkuId}"/>
+                                    </StackPanel>
                                     <TextBlock TextTrimming="CharacterEllipsis"
-                                               Text="{Binding Title}"
+                                               Margin="0,17,0,0">
-                                               Margin="0,10,0,0">
+                                          <Run Text="名称:"/>
+                                          <Run Text="{Binding Title}"/>
                                         <TextBlock.ToolTip>
                                             <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
                                                 <TextBlock Text="{Binding Title}"/>
                                             </ToolTip>
                                         </TextBlock.ToolTip>
                                     </TextBlock>
-                                    <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                                    <StackPanel Orientation="Horizontal" Margin="0,17,0,0">
                                         <TextBlock>
                                             <Run Text="采购平台:"/>
                                             <Run Text="{Binding PurchasePlatform}"/>

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -46,7 +46,7 @@ namespace BBWY.Server.Business
                                                                      {
                                                                          PurchaseSchemeId = ps.Id,
                                                                          ps.PurchaserId,
-                                                                         PurchaseName = p.Name,
+                                                                         PurchaserName = p.Name,
                                                                          ps.PurchasePlatform,
                                                                          ps.SkuId
                                                                      });
@@ -82,7 +82,7 @@ namespace BBWY.Server.Business
                             Price = productSku.Price,
                             Title = productSku.Title,
                             State = productSku.State,
-                            PurchaseName = currentScheme.PurchaseName,
+                            PurchaserName = currentScheme.PurchaserName,
                             PurchasePlatform = currentScheme.PurchasePlatform,
                             PurchaserId = currentScheme.PurchaserId,
                             PurchaseSchemeId = currentScheme.PurchaseSchemeId
@@ -90,19 +90,6 @@ namespace BBWY.Server.Business
                     }
                 }
             }
-
-
-            //var pruductSkuSchemeList = productSkuList.Map<IList<ProductSkuWithSchemeResponse>>();
-            //foreach (var ps in pruductSkuSchemeList)
-            //{
-            //    var scheme = schemeList.FirstOrDefault(s => s.SkuId == ps.Id);
-            //    if (scheme == null)
-            //        continue;
-            //    ps.PurchaseSchemeId = scheme.PurchaseSchemeId;
-            //    ps.PurchaserId = scheme.PurchaserId;
-            //    ps.PurchaseName = scheme.PurchaseName;
-            //    ps.PurchasePlatform = scheme.PurchasePlatform;
-            //}
             return list;
         }
 

BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs

@@ -33,7 +33,7 @@ namespace BBWY.Server.Model.Dto
 
         public string PurchaserId { get; set; }
 
-        public string PurchaseName { get; set; }
+        public string PurchaserName { get; set; }
 
         public Enums.Platform? PurchasePlatform { get; set; }
     }