淘宝异常拍单功能

29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml

@@ -69,7 +69,10 @@
 					VerticalAlignment="Center"
 					Panel.ZIndex="99"
 					d:Text="TextBlock"
+					Background="#C0FFFFFF"
+					FontSize="20"
 					Foreground="Red"
+					IsHitTestVisible="False"
 					Text="{Binding ErrorMsg}"
 					TextWrapping="Wrap"
 					Visibility="{Binding ErrorMsg, Converter={StaticResource HasTextVisibility}}" />

29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs

@@ -1622,7 +1622,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 				ErrorMsg = "中转地址对应的中转仓不存在，请核对";
 				return;
 			}
-			if (string.IsNullOrEmpty(txtBuyOrderIdVal.Trim()))
+			if (string.IsNullOrEmpty(txtBuyOrderIdVal?.Trim()))
 			{
 				ErrorMsg = "缺少拍单订单号，请拍单后再提交";
 				return;
@@ -1719,7 +1719,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 
 					orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
 					{
-						buyer_account = buyer.buyer_nick,
+						buyer_account = buyer.buyer_id,
 						id = 0,
 						order_no = orderItem.order_id,
 						order_sku_id = orderItem.sku_id,
@@ -1782,6 +1782,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 					// 利润计算重置为最小值，控件Resource更新时将计算利润
 					orderItem.ProfitCount = decimal.MinValue;
 					var order = orderItem?.ItemOrder;
+					orderItem.SetOrderItemTextProperty();
+					order.SetOrderTextProperty();
 					MainWindow.Instance.orderListCtrl.FilterOneOrder(order, true);
 				}
 				#endregion

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs

@@ -538,6 +538,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				taobaoBuyView.ViewModel.InitUrl = "https://s.taobao.com/search?";
 				taobaoBuyView.ViewModel.IsMappingGoods = true;
 			}
+			if (isAbnormalOrder)
+				taobaoBuyView.ViewModel.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
 			new DialogWindow()
 			{
 				Title = "淘宝买手登录",

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -833,6 +833,11 @@ namespace AllBase.Model.DBModel
 
 		public bool GetIsAbnormal()
 		{
+			if (order_id == "3739720775494980096")
+			{
+
+			}
+
 			// 三退或者两退，为退款完成单
 			//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
 			//	(oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))