淘宝物流读取cef逻辑优化

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml

@@ -58,7 +58,7 @@
 						VerticalAlignment="Center"
 						BorderBrush="{StaticResource mainColorBrush}"
 						Checked="chkAutoReadBuyerOrder_CheckedChanged"
-						Content="自动读买手单"
+						Content="自动读多多买手单"
 						FontSize="12"
 						IsChecked="true"
 						Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs

@@ -2802,12 +2802,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 
         private void btnHideAll_Click(object sender, RoutedEventArgs e)
         {
-            if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible)
-                MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
-            if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1)
-                Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1);
+            if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible)
+                MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+            if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1)
+                Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1);
             else
-                Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1);
+                Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1);
         }
 
         private void CheckBox_Click(object sender, RoutedEventArgs e)

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs

@@ -153,16 +153,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 		{
 			if (wpPddBuyer.Visibility == Visibility.Visible)
 			{
-				if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible)
-					MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
-				if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1)
-					Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1);
+				if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible)
+					MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+				if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1)
+					Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1);
 				else
-					Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1);
+					Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1);
+				MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+				MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Collapsed;
+			}
+			else if (wpTaobaoBuyer.Visibility == Visibility.Visible)
+			{
+				if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible)
+					MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+				if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1)
+					Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1);
+				else
+					Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1);
+				MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Collapsed;
+				MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
 			}
 			else
 			{
-				Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1);
+				Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1);
 			}
 
 		}

29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml

@@ -139,12 +139,12 @@
 					<ColumnDefinition Width="auto" />
 				</Grid.ColumnDefinitions>
 				<Border
-					x:Name="borderPddBuyer"
+					x:Name="borderTbBuyer"
 					Width="138"
 					Background="White"
 					CornerRadius="0,4,4,0">
 					<Grid>
-						<ListBox x:Name="lbPddBuyer">
+						<ListBox x:Name="lbTbBuyer">
 							<!--  使用自定义属性模板去除ListBox高亮显示框  -->
 							<ListBox.ItemContainerStyle>
 								<Style TargetType="ListBoxItem">

29WxOrderWpf/MainWindow.xaml

@@ -135,19 +135,20 @@
 				d:Visibility="Visible"
 				Visibility="Collapsed" />
 			<Grid
-				x:Name="gridPddBuyerOrderReadCtrl"
+				x:Name="gridTbBuyerOrderReadCtrl"
 				Grid.ColumnSpan="2"
 				d:Visibility="Visible"
 				Background="#7F000000"
 				MouseLeftButtonUp="gridPddBuyerOrderReadCtrl_MouseLeftButtonUp"
 				Visibility="Hidden">
-				<Border
+                <Border
 					Height="auto"
 					Margin="0,50,0,0"
 					HorizontalAlignment="Right"
 					Background="White"
 					CornerRadius="10">
-					<buyerctrls:PDDBuyerOrderReadCtrl
+                    <Grid>
+                        <buyerctrls:PDDBuyerOrderReadCtrl
 						x:Name="pddBuyerOrderReadCtrl"
 						Grid.Column="1"
 						Width="1200"
@@ -155,7 +156,16 @@
 						Panel.ZIndex="-1"
 						d:Visibility="Visible"
 						Visibility="Collapsed" />
-				</Border>
+                        <buyerctrls:TbBuyerOrderReadCtrl
+						x:Name="tbBuyerOrderReadCtrl"
+						Grid.Column="1"
+						Width="1200"
+						HorizontalAlignment="Right"
+						Panel.ZIndex="-1"
+						d:Visibility="Collapsed"
+						Visibility="Collapsed" />
+                    </Grid>
+                </Border>
 			</Grid>
 			<buyerctrls:PDDBuyerSelectCtrl
 				x:Name="pddBuyerSelectCtrl"

29WxOrderWpf/MainWindow.xaml.cs

@@ -381,16 +381,16 @@ namespace _29WxOrderWpf
 				{ }
 			} 
 		}
-        #endregion
+		#endregion
 
-        #region 读取拼多多买手号
-        public bool isGetPddBuyer = false;
-        public bool hasGetPddBuyer = false;
+		#region 读取拼多多买手号
+		public bool isGetPddBuyer = false;
+		public bool hasGetPddBuyer = false;
 
-        /// <summary>
-        /// 读取拼多多买手
-        /// </summary>
-        public void GetPddBuyer()
+		/// <summary>
+		/// 读取拼多多买手
+		/// </summary>
+		public void GetPddBuyer()
         {
             if (isGetPddBuyer)
                 return;

AllBase/Model/DBModel/order_pdd_buyer_after_sale.cs

@@ -6,7 +6,12 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.DBModel
 {
-    public class order_pdd_buyer_after_sale
+	public class order_tb_buyer_after_sale : order_pdd_buyer_after_sale
+	{
+
+	}
+
+	public class order_pdd_buyer_after_sale
     {
         public long? id { get; set; }
         public string wx_order_id { get; set; }

AllBase/Model/DBModel/order_pdd_buyer_order.cs

@@ -6,7 +6,12 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.DBModel
 {
-    public class order_pdd_buyer_order
+	public class order_tb_buyer_order : order_pdd_buyer_order
+	{
+
+	}
+
+	public class order_pdd_buyer_order
     {
         public long? id { get; set; }
         public string wx_order_id { get; set; }

AllBase/Model/Result/PddBuyerAfterSaleLiteInfo.cs

@@ -9,7 +9,11 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.Result
 {
-    public class PddBuyerAfterSaleLiteInfo : PropertyNotifyObject
+	public class TbBuyerAfterSaleLiteInfo : PddBuyerAfterSaleLiteInfo
+	{
+	}
+
+	public class PddBuyerAfterSaleLiteInfo : PropertyNotifyObject
     {
         public string WxSendTypeStr
         {

AllBase/Model/Result/PddBuyerOrderLiteInfo.cs

@@ -12,6 +12,11 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.Result
 {
+	public class TbBuyerOrderLiteInfo : PddBuyerOrderLiteInfo
+	{
+
+	}
+
     public class PddBuyerOrderLiteInfo : PropertyNotifyObject
     {
         /// <summary>
@@ -420,6 +425,17 @@ namespace AllBase.Model.Result
 				return GetPddToWxExpressCompanyCode(outExpressCompanyName);
 			}
 		}
+		/// <summary>
+		/// 外采淘宝订单物流名称对应微信物流公司编码
+		/// </summary>
+		[JsonIgnore]
+		public string outTbToWxExpressCompanyCode
+		{
+			get
+			{
+				return GetPddToWxExpressCompanyCode(outExpressCompanyName);
+			}
+		}
 		public string outExpressCompanyName
         {
             get

AllBase/Model/Result/PddPickInfo.cs

@@ -6,6 +6,11 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.Result
 {
+	public class TbPickInfo : PddPickInfo
+	{
+
+	}
+
 	public class PddPickInfo
 	{
 		public string station_name {get;set;} // ""