From 6a9131aaad3a39250977bedf84997af79d9ed79a Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 10 Jun 2022 05:01:31 +0800
Subject: [PATCH] =?UTF-8?q?sd=E6=88=90=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APIModel/Response/Order/OrderResponse.cs  | 20 +++++++++
 BBWY.Client/Models/Enums.cs                   |  6 +--
 BBWY.Client/Models/Order/Order.cs             | 20 +++++++++
 .../ProcurementAuditViewModel.cs              |  2 +-
 .../ViewModels/Order/OrderListViewModel.cs    |  4 +-
 BBWY.Client/Views/Order/SD.xaml               | 43 ++++++++++++++-----
 BBWY.Client/Views/Order/SD.xaml.cs            | 26 ++++++++++-
 BBWY.Server.Business/Order/OrderBusiness.cs   |  4 ++
 BBWY.Server.Model/Db/Order/Order.cs           | 24 +++++++++++
 .../Dto/Response/Order/OrderResponse.cs       | 20 +++++++++
 BBWY.Server.Model/Enums.cs                    |  8 ++++
 11 files changed, 159 insertions(+), 18 deletions(-)

diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
index a285f0d9..8a993abc 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
@@ -118,6 +118,26 @@ namespace BBWY.Client.Models
         /// </summary>
         public SDType? SDType { get; set; }
 
+        /// <summary>
+        /// 刷单关键词
+        /// </summary>
+        public string SDKey { get; set; }
+
+        /// <summary>
+        /// 刷单支付渠道
+        /// </summary>
+        public PayBillType? SDPayChannel { get; set; }
+
+        /// <summary>
+        /// 刷单交易账单号
+        /// </summary>
+        public string SDPayBillNo { get; set; }
+
+        /// <summary>
+        /// 刷单人
+        /// </summary>
+        public string SDOperator { get; set; }
+
         /// <summary>
         /// 收货人信息
         /// </summary>
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index bf867902..66c8d1f9 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -102,9 +102,9 @@
 
     public enum PayBillType
     {
-        AliPay = 0,
-        WeiXin = 1,
-        BankCard = 2
+        支付宝 = 0,
+        微信 = 1,
+        银行卡 = 2
     }
 
     public enum AuditFileType
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index 8d60a0ac..e1ecbd67 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -117,6 +117,26 @@ namespace BBWY.Client.Models
         /// </summary>
         public SDType? SDType { get; set; }
 
+        /// <summary>
+        /// 刷单关键词
+        /// </summary>
+        public string SDKey { get; set; }
+
+        /// <summary>
+        /// 刷单支付渠道
+        /// </summary>
+        public PayBillType? SDPayChannel { get; set; }
+
+        /// <summary>
+        /// 刷单交易账单号
+        /// </summary>
+        public string SDPayBillNo { get; set; }
+
+        /// <summary>
+        /// 刷单人
+        /// </summary>
+        public string SDOperator { get; set; }
+
         /// <summary>
         /// 订单状态
         /// </summary>
diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
index 0a7e1d83..73002e72 100644
--- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
+++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
@@ -422,7 +422,7 @@ namespace BBWY.Client.ViewModels
                     {
                         BelongFileName = importResult.FileName,
                         PayBillNo = payBillNo,
-                        PayBillType = PayBillType.AliPay,
+                        PayBillType = PayBillType.支付宝,
                         SourceMerchantOrderNo = sourceMerchantOrderNo,
                         ProductName = array[3].FormatString(),
                         PayTime = DateTime.Parse(array[4].FormatString()),
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index a1ed0c19..23c190e8 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -313,7 +313,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (storageType == StorageType.SD)
             {
-                var sd = new SD(orderId, true, order.VenderRemark, order.Flag);
+                var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, string.Empty);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }
@@ -425,7 +425,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (order.StorageType == StorageType.SD)
             {
-                var sd = new SD(order.Id, false, order.VenderRemark, order.Flag);
+                var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }
diff --git a/BBWY.Client/Views/Order/SD.xaml b/BBWY.Client/Views/Order/SD.xaml
index 8fc4fc5f..4873bb2b 100644
--- a/BBWY.Client/Views/Order/SD.xaml
+++ b/BBWY.Client/Views/Order/SD.xaml
@@ -8,7 +8,7 @@
            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
            xmlns:local="clr-namespace:BBWY.Client.Views.Order"
            mc:Ignorable="d"
-           Title="SD订单" Height="300" Width="300"
+           Title="SD订单" Height="500" Width="300"
            Style="{StaticResource bwstyle}"
            MinButtonVisibility="Collapsed"
            MaxButtonVisibility="Collapsed"
@@ -19,6 +19,12 @@
                 <x:Type TypeName="cmodel:SDType"/>
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
+
+        <ObjectDataProvider x:Key="PayBillTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="cmodel:PayBillType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
     </c:BWindow.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -30,9 +36,12 @@
                 Background="{StaticResource Border.Background}">
             <TextBlock Text="SD订单" Style="{StaticResource middleTextBlock}"/>
         </Border>
-
         <Grid Grid.Row="1">
             <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
                 <RowDefinition Height="40"/>
                 <RowDefinition Height="40"/>
                 <RowDefinition Height="40"/>
@@ -49,14 +58,28 @@
                       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="txtSDCommissionAmount" 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="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"/>
+            <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"/>
+            <c:BTextBox x:Name="txtDeliveryExpressFreight" Grid.Column="1" Grid.Row="3" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
+
+            <TextBlock Text="付款渠道" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="4"/>
+            <ComboBox x:Name="cbx_SDPayChannel" Grid.Column="1" Grid.Row="4" ItemsSource="{Binding Source={StaticResource PayBillTypeProvider}}"
+                      Height="25" Width="100" 
+                      SelectedIndex="0"  HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/>
+
+            <TextBlock Text="交易账单号" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="5"/>
+            <c:BTextBox x:Name="txt_SDPayBillNo" Grid.Column="1" Grid.Row="5" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
 
-            <TextBlock Text="邮费" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="2"/>
-            <c:BTextBox x:Name="txtDeliveryExpressFreight" 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="6"/>
+            <c:BTextBox x:Name="txt_SDOperator" Grid.Column="1" Grid.Row="6" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
 
-            <TextBlock Text="标签" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="3"/>
-            <ComboBox x:Name="cbx_flag" Grid.Column="1" Grid.Row="3" Height="25" Width="100"  
+            <TextBlock Text="标签" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="7"/>
+            <ComboBox x:Name="cbx_flag" Grid.Column="1" Grid.Row="7" Height="25" Width="100"  
                       HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"
                       SelectedIndex="0" FocusVisualStyle="{x:Null}">
                 <ComboBox.ItemTemplate>
@@ -68,8 +91,8 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-            <TextBlock Text="商家备注" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="4"/>
-            <c:BTextBox x:Name="txtVenderRemark" Grid.Column="1" Grid.Row="4" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
+            <TextBlock Text="商家备注" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="8"/>
+            <c:BTextBox x:Name="txtVenderRemark" Grid.Column="1" Grid.Row="8" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
         </Grid>
 
         <c:BButton x:Name="btn_Save" Content="保存" Grid.Row="2" Width="60" HorizontalAlignment="Right" Margin="0,0,8,0"
diff --git a/BBWY.Client/Views/Order/SD.xaml.cs b/BBWY.Client/Views/Order/SD.xaml.cs
index c1d08f2b..94b21d1f 100644
--- a/BBWY.Client/Views/Order/SD.xaml.cs
+++ b/BBWY.Client/Views/Order/SD.xaml.cs
@@ -26,14 +26,25 @@ namespace BBWY.Client.Views.Order
 
         public string VenderRemark { get; private set; }
 
-        public SD(string orderId, bool isSetStorageType, string venderRemark, string flag)
+        public string SDKey { get; private set; }
+
+        public PayBillType? PayChannel { get; set; }
+
+        public string SdPayBillNo { get; set; }
+
+        public string SdOperator { get; set; }
+
+        public SD(string orderId, bool isSetStorageType, string venderRemark, string flag, string sdKey, PayBillType? payChannel, string sdPayBillNo, string sdOperator)
         {
             InitializeComponent();
             this.OrderId = orderId;
             this.IsSetStorageType = isSetStorageType;
             this.VenderRemark = venderRemark;
             this.Flag = flag;
-
+            this.SDKey = sdKey;
+            this.PayChannel = payChannel;
+            this.SdPayBillNo = sdPayBillNo;
+            this.SdOperator = sdOperator;
         }
         private void BWindow_Loaded(object sender, RoutedEventArgs e)
         {
@@ -50,6 +61,12 @@ namespace BBWY.Client.Views.Order
             cbx_flag.ItemsSource = flagList;
             if (!string.IsNullOrEmpty(Flag))
                 cbx_flag.SelectedItem = flagList.FirstOrDefault(kv => kv.Value == Flag) ?? flagList[0];
+
+            this.txt_SDKey.Text = SDKey;
+            if (PayChannel != null)
+                this.cbx_SDPayChannel.SelectedItem = PayChannel;
+            this.txt_SDPayBillNo.Text = SdPayBillNo;
+            this.txt_SDOperator.Text = SdOperator;
         }
 
         private void btn_Save_Click(object sender, RoutedEventArgs e)
@@ -67,6 +84,11 @@ namespace BBWY.Client.Views.Order
             SDType = (SDType)cbx_sdType.SelectedItem;
             VenderRemark = txtVenderRemark.Text;
 
+            SDKey = this.txt_SDKey.Text;
+            PayChannel = (PayBillType)this.cbx_SDPayChannel.SelectedItem;
+            SdPayBillNo = this.txt_SDPayBillNo.Text;
+            SdOperator = this.txt_SDOperator.Text;
+
             this.DialogResult = true;
             this.Close();
         }
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index eec9c8da..3f361f54 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -116,6 +116,10 @@ namespace BBWY.Server.Business
                 WaybillNo = o.WaybillNo,
                 Flag = o.Flag,
                 SDType = o.SDType,
+                SDKey = o.SDKey,
+                SDOperator = o.SDOperator,
+                SDPayBillNo = o.SDPayBillNo,
+                SDPayChannel = o.SDPayChannel,
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,
diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs
index 1f39c77d..7ecc9569 100644
--- a/BBWY.Server.Model/Db/Order/Order.cs
+++ b/BBWY.Server.Model/Db/Order/Order.cs
@@ -143,6 +143,30 @@ namespace BBWY.Server.Model.Db
         [Column(MapType = (typeof(int?)))]
         public Enums.SDType? SDType { get; set; }
 
+        /// <summary>
+        /// 刷单关键词
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string SDKey { get; set; }
+
+        /// <summary>
+        /// 刷单支付渠道
+        /// </summary>
+        [Column(MapType = (typeof(int?)))]
+        public Enums.PayChannelType? SDPayChannel { get; set; }
+
+        /// <summary>
+        /// 刷单交易账单号
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string SDPayBillNo { get; set; }
+
+        /// <summary>
+        /// 刷单人
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string SDOperator { get; set; }
+
         #region 订单成本
         /// <summary>
         /// 平台扣点金额
diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
index 3c9b1d79..3894bf22 100644
--- a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
@@ -129,6 +129,26 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public Enums.SDType? SDType { get; set; }
 
+        /// <summary>
+        /// 刷单关键词
+        /// </summary>
+        public string SDKey { get; set; }
+
+        /// <summary>
+        /// 刷单支付渠道
+        /// </summary>
+        public Enums.PayChannelType? SDPayChannel { get; set; }
+
+        /// <summary>
+        /// 刷单交易账单号
+        /// </summary>
+        public string SDPayBillNo { get; set; }
+
+        /// <summary>
+        /// 刷单人
+        /// </summary>
+        public string SDOperator { get; set; }
+
         /// <summary>
         /// 收货人信息
         /// </summary>
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 4b485901..79af52e2 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -102,5 +102,13 @@
             Running = 0,
             End = 1
         }
+
+
+        public enum PayChannelType
+        {
+            支付宝 = 0,
+            微信 = 1,
+            银行卡 = 2
+        }
     }
 }