修复退货仓不能自动执行的问题

29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs

@@ -468,6 +468,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 							Thread.Sleep(100);
 						}
 
+						// 如果在商品搜索页面
 						if (Address.StartsWith("https://s.taobao.com/search?"))
 						{
 							Thread.Sleep(1000);
@@ -519,6 +520,95 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 								Thread.Sleep(500);
 							}
 						}
+
+						if (Address.StartsWith("https://item.taobao.com/item.htm?id="))
+						{
+							//修改
+							Thread.Sleep(Randomx.GetId(500, 1000));
+							CefWebBrowser.Load("https://i.taobao.com/my_itaobao/receiver-address-pc");
+
+							var client = CefWebBrowser.GetDevToolsClient();
+							var host = CefWebBrowser.GetBrowserHost();
+							if (client == null || host == null)
+								return;
+
+							string jsRst = "failed";
+							StringBuilder sb = new StringBuilder();
+							sb.Append("(function() {\r\n");
+							//sb.Append("    var searchBtns = document.getElementsByTagName('a');\r\n");
+							sb.Append("    var searchBtns = document.getElementsByClassName('t-change');\r\n");
+							sb.Append("    for (i = 0; i < searchBtns.length; i++) {\r\n");
+							sb.Append("        var searchBtn = searchBtns[i];\r\n");
+							sb.Append("        if (searchBtn.innerHTML='修改') {\r\n");
+							sb.Append("            searchBtn.click();\r\n");
+							sb.Append("            return 'success';\r\n");
+							sb.Append("        }\r\n");
+							sb.Append("    }\r\n");
+							sb.Append("    return 'failed';\r\n");
+							sb.Append("})();");
+							var jsStr = sb.ToString();
+							for (int i = 0; i < 20 && jsRst != "success"; i++)
+							{
+								var r = await client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
+								jsRst = r.Result.Value.ParseToString();
+								Thread.Sleep(500);
+							}
+						}
+
+						// 如果在地质修改页面
+						if (Address.StartsWith("https://i.taobao.com/my_itaobao/receiver-address-pc"))
+						{
+							Thread.Sleep(1000);
+
+							return;
+
+							string jsRst = "failed";
+							StringBuilder sb = new StringBuilder();
+							sb.Append("(function() {\r\n");
+							sb.Append("    var searchBtn = document.getElementsByClassName('image-search-icon-outerMode')[0];\r\n");
+							sb.Append("    if (searchBtn)\r\n");
+							sb.Append("        searchBtn.click();\r\n");
+							sb.Append("    else\r\n");
+							sb.Append("        return 'failed';\r\n");
+							sb.Append("})();");
+							var jsStr = sb.ToString();
+							var client = CefWebBrowser.GetDevToolsClient();
+							var host = CefWebBrowser.GetBrowserHost();
+							if (client == null || host == null)
+								return;
+
+							for (int i = 0; i < 10 && jsRst == "failed"; i++)
+							{
+								var r = await client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
+								jsRst = r.Result.Value.ParseToString();
+								Thread.Sleep(500);
+							}
+
+							var image = ImageBuild.LoadBitmipImageFromUrl(orderItem.thumb_img);
+							if (image == null)
+								return;
+
+							await Application.Current.Dispatcher.InvokeAsync(new Action(() => { Clipboard.SetImage(image); }));
+							host.SendKeyEvent(new CefSharp.KeyEvent() { WindowsKeyCode = 86, Type = KeyEventType.RawKeyDown, Modifiers = CefEventFlags.ControlDown });
+							Thread.Sleep(Randomx.GetId(2500, 3000));
+
+							jsRst = "failed";
+							sb = new StringBuilder();
+							sb.Append("(function() {\r\n");
+							sb.Append("    var searchBtn = document.getElementById('image-search-upload-button');\r\n");
+							sb.Append("    if (searchBtn)\r\n");
+							sb.Append("        searchBtn.click();\r\n");
+							sb.Append("    else\r\n");
+							sb.Append("        return 'failed';\r\n");
+							sb.Append("})();");
+							jsStr = sb.ToString();
+							for (int i = 0; i < 10 && jsRst == "failed"; i++)
+							{
+								var r = await client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
+								jsRst = r.Result.Value.ParseToString();
+								Thread.Sleep(500);
+							}
+						}
 					});
 				}
 			});
@@ -601,6 +691,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 
 		private async Task DoResourceLoadComplete(string url, string responseData)
 		{
+			if (responseData.Contains("请重新登录"))
+			{
+				TaobaoLoginViewModel.UpdateServerBuyerDisconnect(this.buyer);
+				return;
+			}
+
 			//https://detail.tmall.com/item.htm?id=655638393036&sku_properties=1627207%3A42499150508
 			//{"appData":null,"loaderData":{"home":{"data":{"res":{"seller":{"sellerNick":"匹克世冠专卖店","shopName":"匹克世冠专卖店","evaluates":[{"score":"4.8 ","level":"1","levelText":"高","title":"宝贝描述","type":"desc"},{"score":"4.8 ","level":"1","levelText":"高","title":"卖家服务","type":"serv"},{"score":"4.8 ","level":"1","levelText":"高","title":"物流服务","type":"post"}],"startsIcon":"https://img.alicdn.com/imgextra/i4/O1CN018GrFIW1Zx7vwjt3Jg_!!6000000003260-2-tps-91-14.png","pcShopUrl":"//shop67269976.taobao.com","creditLevelIcon":"//gw.alicdn.com/imgextra/i1/O1CN01VD9Iap25oweneR31D_!!6000000007574-2-tps-120-60.png","sellerType":"B","encryptUid":"RAzN8HWKpmWFSf9AkzVpz3nhAYRZrPS63pSiDPMWyvui5ixfJBs"},"item":{"images":["https://img.alicdn.com/imgextra/i4/717513321/O1CN01cvzkE61aP4Tjeupfh_!!4611686018427380329-0-item_pic.jpg","https://img.alicdn.com/imgextra/i3/717513321/O1CN01W9mF4N1aP4OAc3Mtt_!!4611686018427380329-0-item_pic.jpg","https://img.alicdn.com/imgextra/i1/717513321/O1CN01a72PTr1aP4S55SiRs_!!4611686018427380329-0-item_pic.jpg"],"title":"匹克态极拖鞋男情侣款夏季外穿潮鞋篮球运动防滑太极沙滩凉拖鞋女","itemId":"655638393036","useWirelessDesc":"true","qrCode":"https://h5.m.taobao.com/awp/core/detail.htm?id=655638393036","spuId":"2122802472","titleIcon":"//img.alicdn.com/tfs/TB1SMG7nnvI8KJjSspjXXcgjXXa-78-36.png?getAvatar=avatar"},"feature":{"pcResistDetail":"true","tmwOverseasScene":"false","pcIdentityRisk":"true"},"plusViewVO":{"askAnswerVO":{"ext":{"skeletonImg":"https://img.alicdn.com/imgextra/i2/O1CN01MLPxBr1flZy969k5W_!!6000000004047-2-tps-1376-1216.png"},"hit":"true"},"addCartActionVO":{"ext":{"type":"dialogWithRecommond_2","frequency":"day:1;repeat:1"},"hit":"true"},"guessLikeVO":{"hit":"true"},"wangwangFlowSplitVO":{"hit":"true"},"rankVO":{"hit":"true"},"tabPlaceholderVO":{"hit":"true"},"imageSearchVO":{"ext":{"textList":["商品已经下架啦~要不要瞧瞧别的~","该区域暂不支持购买","此商品不支持在当前地区销售","商品已经卖光啦~","当前商品仅限店铺会员购买","商品已经卖光啦，非常抱歉","店铺正在打烊中，当前商品不可下单","商品已经卖光啦～","当前库存已售完","该商品有卖家设置的购买门槛，须达门槛才可购买噢～","此商品暂时不能购买"]},"spm":"aliabtest1115297_1138353","hit":"true"},"reportEntranceVO":{"spm":"aliabtest1097211_1051854","hit":"true"},"headAtmosphereBeltVO":{"valid":"false","hit":"true"},"commentListVO":{"ext":{"countShow":"\"false\""},"hit":"true"},"pcFrontSkuQuantityLimitVO":{"hit":"true"},"buyParamVO":{"ext":{"autoApplCoupSource":"pcDetailOrder","needAutoApplCoup":"true"},"hit":"true"}},"skuCore":{"skuItem":{"renderSku":"true","itemStatus":0,"unitBuy":1},"sku2info":{"0":{"moreQuantity":"true","quantity":200,"logisticsTime":"平均9小时发货","price":{"priceTitle":"优惠前","priceColorNew":"#FFFFFF","priceText":"157","priceDesc":"起","priceMoney":"15700"},"quantityDisplayValue":1,"quantityText":"有货","buyExParams":{"mi_id":"0000m5cdA3X8kO8PXBJ3r8ji8d6gjumNVDVBkp9kKySsEPW3KKjUvUifmdD1Plv0m1WF"}},"5359436967823":{"moreQuantity":"false","quantity":12,"logisticsTime":"48小时内发货","price":{"priceTitle":"优惠前","priceColorNew":"#FFFFFF","priceText":"157","priceMoney":"15700"},"cartParam":{"addCartCheck":"true"},"quantityDisplayValue":1,"quantityText":"有货","buyExParams":{"mi_id":"0000m5cdA3X8kO8PXBJ3r8ji8d6gjumNVDVBkp9kKySsEPW3KKjUvUifmdD1Plv0m1WF"}},"5769423993152":{"moreQuantity":"false","quantity":19,"logisticsTime":"48小时内发货","price":{"priceTitle":"优惠前","priceColorNew":"#FFFFFF","priceText":"157","priceMoney":"15700"},"cartParam":{"addCartCheck":"true"},"quantityDisplayValue":1,"quantityText":"有货","buyExParams":{"mi_id":"0000m5cdA3X8kO8PXBJ3r8ji8d6gjumNVDVBkp9kKySsEPW3KKjUvUifmdD1Plv0m1WF"}},"5359436967808":{"moreQuantity":"false","quantity":46,"logisticsTime":"48小时内发货","price":{"priceTitle":"优惠前","priceColorNew":"#FFFFFF","priceText":"157","priceMoney":"15700"},"cartParam":{"addCartCheck":"true"},"quantityDisplayValue":1,"quantityText":"有货","buyExParams":{"mi_id":"0000m5cdA3X8kO8PXBJ3r8ji8d6gjumNVDVBkp9kKySsEPW3KKjUvUifmdD1Plv0m1WF"}},"5359436967810":{"moreQuantity":"false","quantity":95,"logisticsTime":"48小时内发货","price":{"priceTitle":"优惠前","priceColorNew":"#FFFFFF","priceText":"157","priceMoney":"15700"},"cartParam":{"addCartCheck":"true"},"quantityDisplayValue":1,"quantityText":"有货","buyExParams":{"mi_id":"0000m5cdA3X8kO8PXBJ3r8ji8d6gjumNVDVBkp9kKySsEPW3KKjUvUifmdD1Plv0m1WF"}},"5132110197053":{"moreQuantity":"false","quantity":18,"logisticsTime":"平均9小时发货","price":{"priceTitle":"优惠前","priceColorNew":"#FFFFFF","priceText":"169","priceMoney":"16900"},"cartParam":{"addCartCheck":"true"},"quantityDisplayValue":1,"quantityText":"有货","buyExParams":{"mi_id":"0000m5cdA3X8kO8PXBJ3r8ji8d6gjumNVDVBkp9kKySsEPW3KKjUvUifmLine truncated
 			if (url.Contains("https://detail.tmall.com/item.htm?id=") || (responseData.Contains("loaderData") && responseData.Contains("sku2info")))

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

@@ -1186,8 +1186,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				{
 					foreach (var orderItem in order.orderItems)
 					{
-						if (orderItem.order_id == "3738534855500515072")
+						if (orderItem.order_id == "3739105285145538816")
 						{
+							
 
 						}
 						if (order.OrderBuyType == "直发" || order.OrderBuyType == "云改直")
@@ -2334,7 +2335,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			{
 				foreach (var orderItem in order.orderItems)
 				{
-					if (order.order_id == "3738564728075491584")
+					if (order.order_id == "3739105285145538816")
 					{
 
 					}
@@ -2384,7 +2385,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			{
 				foreach (var orderItem in order.orderItems)
 				{
-					if (order.order_id == "3738534855500515072")
+					if (order.order_id == "3739105285145538816")
 					{
 
 					}
@@ -2400,14 +2401,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					if (orderItem?.ItemOrder?.OrderBuyType == "云仓")
 					{
 						if (!string.IsNullOrEmpty(orderItem.ItemTransitOrderWithVoid?.out_order_no) && orderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
-							(orderItem.TransitRefundStatusStr.Contains("需手动申请售后") || orderItem.TransitRefundStatusStr.Contains("待用户发货")))
+							(orderItem.TransitRefundStatusStr.Contains("需手动申请售后") || orderItem.TransitRefundStatusStr.Contains("需手动申请售后") || orderItem.TransitRefundStatusStr.IsNullOrEmpty()))
 							tmpOrderItems.Add(orderItem);
 					}
 
 					if (orderItem?.ItemOrder?.OrderBuyType == "直发")
 					{
 						if (orderItem != null && !string.IsNullOrEmpty(orderItem.ItemOrder?.out_order_no) && orderItem.DirectPddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
-							((orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("需手动申请售后") || (orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("待用户发货")))
+							((orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("需手动申请售后") || (orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("待用户发货") ||
+							 (orderItem.ItemOrder?.out_after_sale_status).IsNullOrEmpty()))
 							tmpOrderItems.Add(orderItem);
 					}
 
@@ -2415,7 +2417,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					if (orderItem?.ItemOrder?.OrderBuyType == "云改直")
 					{
 						if (orderItem != null && !string.IsNullOrEmpty(orderItem.ItemOrder?.out_order_no) && orderItem.DirectPddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
-							((orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("需手动申请售后") || (orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("待用户发货")))
+							((orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("需手动申请售后") || (orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("待用户发货") ||
+							 (orderItem.ItemOrder?.out_after_sale_status).IsNullOrEmpty()))
 							tmpOrderItems.Add(orderItem);
 					}
 				}
@@ -2436,7 +2439,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			int index = 0;
 			foreach (var tmpOrderItem in tmpOrderItems)
 			{
-				if (tmpOrderItem.order_id == "3739068430223324416")
+				if (tmpOrderItem.order_id == "3739105285145538816")
 				{
 
 				}
@@ -2499,7 +2502,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					AfterSaleAddressStr = orderItem.DirectPddBuyerAfterSaleAddressStr;
 				}
 				if (string.IsNullOrEmpty(outOrderNo) || !AfterSaleAddressStr.IsNullOrEmpty() ||
-					(!refundStatusStr.Contains("需手动申请售后") && !refundStatusStr.Contains("待用户发货")))
+					(!refundStatusStr.Contains("需手动申请售后") && !refundStatusStr.Contains("待用户发货") && !refundStatusStr.IsNullOrEmpty()))
 					continue;
 
 				PddBuyerOrderLiteInfo pddBuyerOrderLiteInfo = new PddBuyerOrderLiteInfo();
@@ -2531,7 +2534,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					pddBuyerAfterSale = orderItem.DirectPddBuyerAfterSale;
 
 				bool isSimPddAfterSaleSuccess = true;
-				if (refundStatusStr.Contains("需手动申请售后"))
+				if (refundStatusStr.Contains("需手动申请售后") || string.IsNullOrEmpty(refundStatusStr))
 				{
 					isSimPddAfterSaleSuccess = false;
 					// pddBuyerAfterSale作为参数传入，获取退货退款金额

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

@@ -527,9 +527,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			//https://item.taobao.com/item.htm?id=756295486950&skuId=5216824841295
 			if (orderItem.TbBuyMap != null)
 			{
-
-				taobaoBuyView.ViewModel.InitUrl = "https://item.taobao.com/item.htm?id=" + orderItem.TbBuyMap.map_goods_id + "&skuId=" + orderItem.TbBuyMap.map_sku_id;
 				taobaoBuyView.ViewModel.InitUrl = "https://i.taobao.com/my_itaobao/receiver-address-pc";
+				taobaoBuyView.ViewModel.InitUrl = "https://item.taobao.com/item.htm?id=" + orderItem.TbBuyMap.map_goods_id + "&skuId=" + orderItem.TbBuyMap.map_sku_id;
 			}
 			else
 			{

29WxOrderWpf/ViewModels/TaobaoLoginViewModel.cs

@@ -517,6 +517,28 @@ namespace _29WxOrderWpf.ViewModels
 			return result;
 		}
 
+		/// <summary>
+		/// 设置淘宝店铺掉线
+		/// </summary>
+		/// <param name="buyer"></param>
+		/// <param name="fromTool"></param>
+		/// <returns></returns>
+		public static string UpdateServerBuyerDisconnect(BuyerLoginInfo buyer, string fromTool = null)
+		{
+			//buyer.status = "掉线";
+			//buyer.cookie = "[]";
+			//var url = BaseClass.Build29WxObjString("user/mdy_taobao_buyer_cookie");
+			//var data = UserLogin.GetSignaturex()
+			//	+ "&status=" + "掉线"
+			//	+ "&cookie=" + "[]"
+			//	+ "&buyer_id=" + buyer.buyer_id;
+			//var result = GetHtml.PostUtf8(url, data);
+			//if (!result.Contains("\"code\":200"))
+			//	result = GetHtml.PostUtf8(url, data);
+			//return result;
+			return "";
+		}
+
 		#endregion
 	}