From 0ce137f16aff56e3a4a70884c92e3b81421e377a Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 10 Feb 2022 17:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=8F=91=E6=96=B9=E5=BC=8F=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Enums.cs                   |  9 +++++
 BBWY.Client/Views/Order/ChooseDFType.xaml     | 28 ++++++++++++++++
 BBWY.Client/Views/Order/ChooseDFType.xaml.cs  | 33 +++++++++++++++++++
 .../Views/Order/ChoosePurchaseScheme.xaml     |  9 +++--
 BBWY.Server.Business/Vender/VenderBusiness.cs |  2 +-
 5 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 BBWY.Client/Views/Order/ChooseDFType.xaml
 create mode 100644 BBWY.Client/Views/Order/ChooseDFType.xaml.cs

diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index a5284ba7..1993bced 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -80,4 +80,13 @@
         精准打标 = 1,
         京礼金 = 2
     }
+
+    /// <summary>
+    /// 代发方式
+    /// </summary>
+    public enum DFType
+    {
+        在线采购 = 0,
+        关联订单 = 1
+    }
 }
diff --git a/BBWY.Client/Views/Order/ChooseDFType.xaml b/BBWY.Client/Views/Order/ChooseDFType.xaml
new file mode 100644
index 00000000..71bbfba6
--- /dev/null
+++ b/BBWY.Client/Views/Order/ChooseDFType.xaml
@@ -0,0 +1,28 @@
+<c:BWindow x:Class="BBWY.Client.Views.Order.ChooseDFType"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+           xmlns:local="clr-namespace:BBWY.Client.Views.Order"
+           mc:Ignorable="d"
+           Title="代发方式"
+           Style="{StaticResource bwstyle}"
+           MinButtonVisibility="Collapsed"
+           MaxButtonVisibility="Collapsed"
+           Height="150" Width="300">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="选择代发方式" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
+            <c:BButton Content="采购商品" Width="100" x:Name="btn_purchase" Click="btn_purchase_Click"/>
+            <c:BButton Content="关联订单" Width="100" Margin="10,0,0,0" x:Name="btn_relation" Click="btn_relation_Click"/>
+        </StackPanel>
+    </Grid>
+</c:BWindow>
diff --git a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs
new file mode 100644
index 00000000..179d376e
--- /dev/null
+++ b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs
@@ -0,0 +1,33 @@
+using BBWY.Client.Models;
+using BBWY.Controls;
+
+namespace BBWY.Client.Views.Order
+{
+    /// <summary>
+    /// ChooseDFType.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChooseDFType : BWindow
+    {
+
+        public DFType DFType { get; private set; }
+
+        public ChooseDFType()
+        {
+            InitializeComponent();
+        }
+
+        private void btn_purchase_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.DFType = DFType.在线采购;
+            this.DialogResult = true;
+            this.Close();
+        }
+
+        private void btn_relation_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.DFType = DFType.关联订单;
+            this.DialogResult = true;
+            this.Close();
+        }
+    }
+}
diff --git a/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml b/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
index 3641dbbb..65d29531 100644
--- a/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
+++ b/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
@@ -21,8 +21,13 @@
                 Background="{StaticResource Border.Background}">
             <TextBlock Text="选择采购商" Style="{StaticResource middleTextBlock}"/>
         </Border>
-        <DataGrid Grid.Row="1">
-
+        <DataGrid Grid.Row="1"
+                  ItemsSource="{Binding PurchaseSchemeList}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Binding="{Binding PurchaserName}"/>
+                <DataGridTextColumn Binding="{Binding PurchaserLocation}"/>
+                <DataGridTextColumn Binding="{Binding PurchaserLocation}"/>
+            </DataGrid.Columns>
         </DataGrid>
     </Grid>
 </c:BWindow>
diff --git a/BBWY.Server.Business/Vender/VenderBusiness.cs b/BBWY.Server.Business/Vender/VenderBusiness.cs
index 452b4232..32e49b6c 100644
--- a/BBWY.Server.Business/Vender/VenderBusiness.cs
+++ b/BBWY.Server.Business/Vender/VenderBusiness.cs
@@ -51,7 +51,7 @@ namespace BBWY.Server.Business
                 Platform = Enums.Platform.京东
             });
 
-            restApiService.SendRequest(globalConfig.MdsApi, "/TaskList/Shop/UpdateShop", new
+            _ = restApiService.SendRequest(globalConfig.MdsApi, "/TaskList/Shop/UpdateShop", new
             {
                 venderResponse.ShopName,
                 venderResponse.ShopId,