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
///
public SDType? SDType { get; set; }
+ ///
+ /// 刷单关键词
+ ///
+ public string SDKey { get; set; }
+
+ ///
+ /// 刷单支付渠道
+ ///
+ public PayBillType? SDPayChannel { get; set; }
+
+ ///
+ /// 刷单交易账单号
+ ///
+ public string SDPayBillNo { get; set; }
+
+ ///
+ /// 刷单人
+ ///
+ public string SDOperator { get; set; }
+
///
/// 收货人信息
///
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
///
public SDType? SDType { get; set; }
+ ///
+ /// 刷单关键词
+ ///
+ public string SDKey { get; set; }
+
+ ///
+ /// 刷单支付渠道
+ ///
+ public PayBillType? SDPayChannel { get; set; }
+
+ ///
+ /// 刷单交易账单号
+ ///
+ public string SDPayBillNo { get; set; }
+
+ ///
+ /// 刷单人
+ ///
+ public string SDOperator { get; set; }
+
///
/// 订单状态
///
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 @@
+
+
+
+
+
+
@@ -30,9 +36,12 @@
Background="{StaticResource Border.Background}">
-
+
+
+
+
@@ -49,14 +58,28 @@
SelectedIndex="0" Height="25" Width="100"
HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
@@ -68,8 +91,8 @@
-
-
+
+
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; }
+ ///
+ /// 刷单关键词
+ ///
+ [Column(StringLength = 50)]
+ public string SDKey { get; set; }
+
+ ///
+ /// 刷单支付渠道
+ ///
+ [Column(MapType = (typeof(int?)))]
+ public Enums.PayChannelType? SDPayChannel { get; set; }
+
+ ///
+ /// 刷单交易账单号
+ ///
+ [Column(StringLength = 50)]
+ public string SDPayBillNo { get; set; }
+
+ ///
+ /// 刷单人
+ ///
+ [Column(StringLength = 20)]
+ public string SDOperator { get; set; }
+
#region 订单成本
///
/// 平台扣点金额
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
///
public Enums.SDType? SDType { get; set; }
+ ///
+ /// 刷单关键词
+ ///
+ public string SDKey { get; set; }
+
+ ///
+ /// 刷单支付渠道
+ ///
+ public Enums.PayChannelType? SDPayChannel { get; set; }
+
+ ///
+ /// 刷单交易账单号
+ ///
+ public string SDPayBillNo { get; set; }
+
+ ///
+ /// 刷单人
+ ///
+ public string SDOperator { get; set; }
+
///
/// 收货人信息
///
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
+ }
}
}