From 94cafb3085812db5f8e26d69c5a15105c00508e1 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 29 Jun 2022 01:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E5=8D=95=E5=8F=B7/=E5=88=B7=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/ViewModels/Order/OrderListViewModel.cs |  2 +-
 BBWY.Client/Views/Order/OrderList.xaml             |  2 +-
 BBWY.Client/Views/Order/SD.xaml                    |  3 ++-
 BBWY.Client/Views/Order/SD.xaml.cs                 | 13 +++++++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 35ddd5bc..0faa711f 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -452,7 +452,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (order.StorageType == StorageType.SD)
             {
-                var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator, order.OrderCost.SDCommissionAmount, order.OrderCost.DeliveryExpressFreight);
+                var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator, order.OrderCost.SDCommissionAmount, order.OrderCost.DeliveryExpressFreight, order.SDType ?? SDType.自刷);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 0664b3eb..307c2a5b 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -658,7 +658,7 @@
                                     </TextBlock>
 
                                     <TextBlock x:Name="txt_sdCommissionAmount">
-                                        <Run Text="SD佣金"/>
+                                        <Run Text="{Binding SDType,Converter={StaticResource objConverter},ConverterParameter=自刷:空单号/刷单号:SD佣金}"/>
                                         <Run Text="{Binding OrderCost.SDCommissionAmount}"/>
                                     </TextBlock>
 
diff --git a/BBWY.Client/Views/Order/SD.xaml b/BBWY.Client/Views/Order/SD.xaml
index 4873bb2b..085a228f 100644
--- a/BBWY.Client/Views/Order/SD.xaml
+++ b/BBWY.Client/Views/Order/SD.xaml
@@ -55,13 +55,14 @@
             </Grid.ColumnDefinitions>
             <TextBlock Text="刷单平台" HorizontalAlignment="Right" VerticalAlignment="Center" />
             <ComboBox x:Name="cbx_sdType" Grid.Column="1" ItemsSource="{Binding Source={StaticResource SDTypeProvider}}"
+                      SelectionChanged="cbx_sdType_SelectionChanged"
                       SelectedIndex="0" Height="25" Width="100" 
                       HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/>
 
             <TextBlock Text="关键词" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"/>
             <c:BTextBox x:Name="txt_SDKey" Grid.Column="1" Grid.Row="1" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
 
-            <TextBlock Text="佣金" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="2"/>
+            <TextBlock x:Name="lblSDCommissionAmount" Text="佣金" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="2"/>
             <c:BTextBox x:Name="txtSDCommissionAmount" Grid.Column="1" Grid.Row="2" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
 
             <TextBlock Text="邮费" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="3"/>
diff --git a/BBWY.Client/Views/Order/SD.xaml.cs b/BBWY.Client/Views/Order/SD.xaml.cs
index cd29a78d..f3960de9 100644
--- a/BBWY.Client/Views/Order/SD.xaml.cs
+++ b/BBWY.Client/Views/Order/SD.xaml.cs
@@ -34,7 +34,7 @@ namespace BBWY.Client.Views.Order
 
         public string SdOperator { get; set; }
 
-        public SD(string orderId, bool isSetStorageType, string venderRemark, string flag, string sdKey, PayBillType? payChannel, string sdPayBillNo, string sdOperator, decimal sdCommissionAmount, decimal deliveryExpressFreight)
+        public SD(string orderId, bool isSetStorageType, string venderRemark, string flag, string sdKey, PayBillType? payChannel, string sdPayBillNo, string sdOperator, decimal sdCommissionAmount, decimal deliveryExpressFreight, SDType sDType = Models.SDType.自刷)
         {
             InitializeComponent();
             this.OrderId = orderId;
@@ -47,10 +47,12 @@ namespace BBWY.Client.Views.Order
             this.SdOperator = sdOperator;
             this.SDCommissionAmount = sdCommissionAmount;
             this.DeliveryExpressFreight = deliveryExpressFreight;
+            this.SDType = sDType;
         }
         private void BWindow_Loaded(object sender, RoutedEventArgs e)
         {
             txtVenderRemark.Text = VenderRemark;
+            cbx_sdType.SelectedItem = SDType;
             var flagList = new List<KVModel>()
             {
                 new KVModel() {Key="灰色",Value="Gray"},
@@ -71,6 +73,8 @@ namespace BBWY.Client.Views.Order
             this.txt_SDOperator.Text = SdOperator;
             this.txtDeliveryExpressFreight.Text = DeliveryExpressFreight.ToString();
             this.txtSDCommissionAmount.Text = SDCommissionAmount.ToString();
+
+            lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
         }
 
         private void btn_Save_Click(object sender, RoutedEventArgs e)
@@ -97,6 +101,11 @@ namespace BBWY.Client.Views.Order
             this.Close();
         }
 
-
+        private void cbx_sdType_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (lblSDCommissionAmount == null)
+                return;
+            lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
+        }
     }
 }