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
}
+
+ ///
+ /// 代发方式
+ ///
+ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
+{
+ ///
+ /// ChooseDFType.xaml 的交互逻辑
+ ///
+ 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}">
-
-
+
+
+
+
+
+
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,