支持淘宝拍单
This commit is contained in:
1 parent
5fb42e4d34
commit
41fa98dc2d
12 files changed
+634
-278
No files matched your search
@@ -10,6 +10,7 @@ using AllBase.Model.DBModel;
|
||||
using AllBase.Model.Result;
|
||||
using AllBase.Util;
|
||||
using CefSharp;
|
||||
using CefSharp.DevTools.IO;
|
||||
using CefSharp.DevTools.LayerTree;
|
||||
using CefSharp.DevTools.Network;
|
||||
using CefSharp.Handler;
|
||||
@@ -55,6 +56,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
/// </summary>
|
||||
public partial class TbBuyerOrderReadCtrl : UserControl
|
||||
{
|
||||
/// <summary>
|
||||
/// 淘宝拍单是否走同步单逻辑
|
||||
/// </summary>
|
||||
bool IsTbSyncDirectBuyOrderWaybill = false;
|
||||
|
||||
Dictionary <BuyerLoginInfo, TbPickInfo> dicTbPickInfo = new Dictionary<BuyerLoginInfo, TbPickInfo>();
|
||||
@@ -136,7 +140,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (isHideNoWxOrderNo && order.ShopOrderIdStr.IsNullOrEmpty())
|
||||
return true;
|
||||
if (!string.IsNullOrEmpty(filterTxt) && !order.order_sn.Contains(filterTxt) && !order.ShopOrderIdStr.ParseToString().Contains(filterTxt) &&
|
||||
!order.tracking_number.Contains(filterTxt) &&
|
||||
!order.tracking_number.ParseToString().Contains(filterTxt) &&
|
||||
!order.sendStatus.ParseToString().Contains(filterTxt))
|
||||
return true;
|
||||
return false;
|
||||
@@ -159,8 +163,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
private void UserControl_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
return;
|
||||
|
||||
this.lbTbBuyer.ItemsSource = GlobalConfig.TaobaoBuyerLoginList;
|
||||
|
||||
buyerReadOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<TbBuyerReadOrderConfig>("tb_buyer_read_order_config");
|
||||
@@ -277,7 +279,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
cefShowShopOrderLstWebBrowser.RequestHandler = new LocalRequestHandler(resourceRequestHandler);
|
||||
var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
|
||||
cefShowShopOrderLstWebBrowser.LifeSpanHandler = lifeSapnHandler;
|
||||
cefShowShopOrderLstWebBrowser.KeyboardHandler = new KeyboardHandler();
|
||||
cefShowShopOrderLstWebBrowser.KeyboardHandler = new CefKeyboardHandler();
|
||||
cefShowShopOrderLstWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
|
||||
cefShowShopOrderLstWebBrowser.AddressChanged += CefWebBrowser_AddressChanged;
|
||||
cefShowShopOrderLstWebBrowser.LoadError += CefWebBrowser_LoadError;
|
||||
@@ -293,7 +295,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
cefWebBrowser.RequestHandler = new LocalRequestHandler(resourceRequestHandler);
|
||||
var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
|
||||
cefWebBrowser.LifeSpanHandler = lifeSapnHandler;
|
||||
cefWebBrowser.KeyboardHandler = new KeyboardHandler();
|
||||
cefWebBrowser.KeyboardHandler = new CefKeyboardHandler();
|
||||
cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
|
||||
cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged;
|
||||
cefWebBrowser.LoadError += CefWebBrowser_LoadError;
|
||||
@@ -347,12 +349,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
await CefReadBuyerOrder(url1, data1, buyer);
|
||||
}
|
||||
|
||||
// 读订单
|
||||
// if (url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/aristotle/order_list_v"))
|
||||
//{
|
||||
// await CefReadBuyerOrder(url1, data1);
|
||||
// }
|
||||
|
||||
//// 读取售后
|
||||
//if (url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/blade/after_sales_list"))
|
||||
//{
|
||||
@@ -584,7 +580,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
lblMsg.Content = buyer.buyer_name + " 获取到空订单列表,退出自动滑动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
lblMsg.Content = buyer.buyer_name + " 获取到空订单列表,退出自动读单 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
}));
|
||||
currentReadBuyer = "";
|
||||
return;
|
||||
@@ -641,11 +637,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
o.order_link_url = BaseRegex.GetStringJson(ref shopInfoStr, "orderDetailUrl");
|
||||
o.order_prompt_color = "#E02E24";
|
||||
// 买家已付款 卖家已发货 交易成功 交易关闭 退款成功
|
||||
o.order_status_prompt = BaseRegex.GetStringJson(ref shopInfoStr, "tradeTitle");
|
||||
if (o.order_status_prompt.Contains("退款成功"))
|
||||
{
|
||||
|
||||
}
|
||||
o.parent_order_sn = "";
|
||||
o.service_amount = 0;
|
||||
o.shipping_amount = ((orderPayment.fields.pcPostFee?.value?.Replace("¥", "")).ParseToDecimal() * 100).ParseToInt();
|
||||
o.order_time = o.order_time;
|
||||
o.order_time = BaseClass.DateTimeToTimestampSeconds(BaseRegex.GetStringJson(ref shopInfoStr, "createTime").ParseToDateTime());
|
||||
if (orderLogistics != null)
|
||||
{
|
||||
o.tbOutExpressCompanyMsg = BaseRegex.GetStringJson(ref orderLogistics, "cpName");
|
||||
@@ -682,9 +683,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// lstTbBuyerOrderInfoLite.Remove(order);
|
||||
// lstTbBuyerOrderInfoLite.Insert(index, order);
|
||||
//}));
|
||||
}
|
||||
|
||||
return;
|
||||
list.Add(o);
|
||||
}
|
||||
|
||||
//var list = JsonHelper.DeserializeJsonToList<TbBuyerOrderLiteInfo>(JsonHelper.JObjectParse(data)["orders"].ParseToString());
|
||||
|
||||
@@ -703,8 +704,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
lstSyncLogistics.Add(syncOrder);
|
||||
}
|
||||
}
|
||||
|
||||
// 根据拼多多外采订单列表查询中转仓订单信息
|
||||
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
|
||||
|
||||
// 根据拼多多外采订单列表查询订单扩展信息
|
||||
var orderExtList = GetOrderItemExtInfo(out_order_nos);
|
||||
|
||||
@@ -821,8 +824,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order.sendStatus = o.sendStatus;
|
||||
}
|
||||
|
||||
//order = JsonHelper.DeserializeJsonToObject<TbBuyerOrderInfoLite>(JsonHelper.SerializeObject(o));
|
||||
order.activity_type = o.activity_type;
|
||||
//order = JsonHelper.DeserializeJsonToObject<TbBuyerOrderInfoLite>(JsonHelper.SerializeObject(o));
|
||||
|
||||
// 淘宝专属物流公司名称
|
||||
order.tbOutExpressCompanyMsg = o.tbOutExpressCompanyMsg;
|
||||
|
||||
// 赋值字段属性值
|
||||
order.activity_type = o.activity_type;
|
||||
order.after_sales = o.after_sales;
|
||||
order.discount_amount = o.discount_amount;
|
||||
order.display_amount = o.display_amount;
|
||||
@@ -890,7 +898,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}));
|
||||
}
|
||||
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
// 根据订单状态 取号/修改取号
|
||||
if (order.WxSendTypeStr == "直发")
|
||||
@@ -898,46 +906,44 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 微信售后,客户端取消直发买手订单
|
||||
if (order.ShopOrderRefundStr.ParseToString().Contains("售后"))
|
||||
{
|
||||
if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
{
|
||||
// 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
var afterSaleRst = TbDirectAutoAfterSale(order);
|
||||
isUpdate = true;
|
||||
}
|
||||
// todo 将拼多多售后改为淘宝售后
|
||||
//if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
//{
|
||||
// // 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
// var afterSaleRst = TbDirectAutoAfterSale(order);
|
||||
// isUpdate = true;
|
||||
//}
|
||||
}
|
||||
// 淘宝IsTbSyncDirectBuyOrderWaybill目前为假,不执行同步单逻辑
|
||||
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill != true || IsTbSyncDirectBuyOrderWaybill != true)
|
||||
SendOrderE57(order);
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
{
|
||||
// 微信售后,服务端自动作废订单,客户端取消买手订单即可
|
||||
if (order.ShopOrderRefundStr.ParseToString().Contains("售后"))
|
||||
{
|
||||
if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
{
|
||||
// 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
var afterSaleRst = TbTransitAutoAfterSale(order);
|
||||
isUpdate = true;
|
||||
}
|
||||
{
|
||||
// todo 将拼多多售后改为淘宝售后
|
||||
//if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
//{
|
||||
// // 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
// var afterSaleRst = TbTransitAutoAfterSale(order);
|
||||
// isUpdate = true;
|
||||
//}
|
||||
}
|
||||
if (order.TransitWarehouseRawMessage.ParseToString().Contains("超出派送范围"))
|
||||
{
|
||||
if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
{
|
||||
// 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
var afterSaleRst = TbTransitAutoAfterSale(order);
|
||||
isUpdate = true;
|
||||
}
|
||||
//if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
//{
|
||||
// // 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
// var afterSaleRst = TbTransitAutoAfterSale(order);
|
||||
// isUpdate = true;
|
||||
//}
|
||||
}
|
||||
SendTransitOrderE57(order);
|
||||
}
|
||||
|
||||
if (order.order_sn == "260924-431226960203223")
|
||||
{
|
||||
}
|
||||
if (order.ShopOrderIdStr == "3739392779260688128")
|
||||
{
|
||||
}
|
||||
// 同步单更新处理逻辑 淘宝IsTbSyncDirectBuyOrderWaybill目前为假,不执行同步单逻辑
|
||||
if (order.WxSendTypeStr == "直发" && IsTbSyncDirectBuyOrderWaybill)
|
||||
{
|
||||
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill && !string.IsNullOrEmpty(order.tracking_number) && order.WxOrderStatus < 30)
|
||||
@@ -946,7 +952,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
if (isUpdate && !string.IsNullOrEmpty(order.ShopOrderIdStr)/* && order.WxSendTypeStr != "直发"*/)
|
||||
{
|
||||
|
||||
// 买手订单状态记录到数据库
|
||||
order_tb_buyer_order tbBuyerOrder = new order_tb_buyer_order()
|
||||
{
|
||||
@@ -988,7 +993,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
html3 = GetHtml.PostUtf8(url3, data3);
|
||||
|
||||
//勾选了调用同步单接口,必须直发且库里已有物流单号
|
||||
//勾选了调用同步单接口,必须直发且库里已有物流单号 淘宝IsTbSyncDirectBuyOrderWaybill目前为假,不执行同步单逻辑
|
||||
if (order.WxSendTypeStr == "直发" && IsTbSyncDirectBuyOrderWaybill == true)
|
||||
{
|
||||
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill && !string.IsNullOrEmpty(order.tracking_number) && html3.Contains("\"code\":200"))
|
||||
@@ -997,7 +1002,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
}
|
||||
|
||||
// 填写取件码
|
||||
// 填写取件码 淘宝IsTbSyncDirectBuyOrderWaybill目前为假,不执行同步单逻辑
|
||||
if (order.WxSendTypeStr == "直发" && IsTbSyncDirectBuyOrderWaybill == true)
|
||||
{
|
||||
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill && !string.IsNullOrEmpty(order.tracking_number))
|
||||
@@ -1517,8 +1522,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
Thread.Sleep(Randomx.GetId(2000, 3000));
|
||||
|
||||
Dispatcher.Invoke(new Action(() => { MainWindow.Instance.Title = buyer.buyer_nick + " 待发货读取中"; }));
|
||||
BindBuyer(buyer, "正在读取待发货");
|
||||
Dispatcher.Invoke(new Action(() => { MainWindow.Instance.Title = buyer.buyer_nick + " 订单读取中"; }));
|
||||
BindBuyer(buyer, "正在读取订单");
|
||||
|
||||
top = 0;
|
||||
lastCefReadOrderTime = DateTime.Now;
|
||||
@@ -1554,24 +1559,60 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
times++;
|
||||
|
||||
Thread.Sleep(Randomx.GetId(100, 300));
|
||||
//top += Randomx.GetId(450, 600);
|
||||
//top += Randomx.GetId(450, 600);
|
||||
|
||||
//var jsStr = @"window.scroll({
|
||||
// top: document.body.scrollHeight,
|
||||
// left: 0,
|
||||
// behavior: 'smooth' // 可选,使滚动平滑
|
||||
// });";
|
||||
//jsStr = @"window.scroll({
|
||||
// top: " + top + @",
|
||||
// left: 0,
|
||||
// behavior: 'smooth' // 可选,使滚动平滑
|
||||
// });";
|
||||
//var client = buyer.wpf_browser.GetDevToolsClient();
|
||||
//if (client != null)
|
||||
//{
|
||||
// var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
// result.Wait(5000);
|
||||
//}
|
||||
//var jsStr = @"window.scroll({
|
||||
// top: document.body.scrollHeight,
|
||||
// left: 0,
|
||||
// behavior: 'smooth' // 可选,使滚动平滑
|
||||
// });";
|
||||
//jsStr = @"window.scroll({
|
||||
// top: " + top + @",
|
||||
// left: 0,
|
||||
// behavior: 'smooth' // 可选,使滚动平滑
|
||||
// });";
|
||||
//var client = buyer.wpf_browser.GetDevToolsClient();
|
||||
//if (client != null)
|
||||
//{
|
||||
// var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
// result.Wait(5000);
|
||||
//}
|
||||
|
||||
// 1.点击下一页按钮
|
||||
string jsRst = "failed";
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.Append("(function() {\r\n");
|
||||
sb.Append(" var searchElements = document.getElementsByTagName('div');\r\n");
|
||||
sb.Append(" for (i = 0; i < searchElements.length; i++) {\r\n");
|
||||
sb.Append(" var searchElement = searchElements[i];\r\n");
|
||||
sb.Append(" if (searchElement.innerHTML.indexOf('下一页') >= 0 && searchElement.innerHTML.indexOf('下一页') <= 3 && searchElement.outerHTML.indexOf('disabled') >= 0) {\r\n");
|
||||
sb.Append(" return 'end';\r\n");
|
||||
sb.Append(" }\r\n");
|
||||
sb.Append(" if (searchElement.innerHTML.indexOf('下一页') >= 0 && searchElement.innerHTML.indexOf('下一页') <= 3) {\r\n");
|
||||
sb.Append(" searchElement.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();
|
||||
var client = buyer.wpf_browser.GetDevToolsClient();
|
||||
var t = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
t.Wait(10000);
|
||||
jsRst = t.Result.Result.Value.ParseToString();
|
||||
if (jsRst.IsNullOrEmpty() || jsRst == "failed")
|
||||
{
|
||||
Dispatcher.Invoke(() => { lblMsg.Content = buyer.buyer_name + " 订单读取失败,跳过 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); });
|
||||
BindBuyer(buyer, "订单读取失败,跳过");
|
||||
break;
|
||||
}
|
||||
if (jsRst == "end")
|
||||
{
|
||||
Dispatcher.Invoke(() => { lblMsg.Content = buyer.buyer_name + " 订单读取完毕,跳过 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); });
|
||||
BindBuyer(buyer, "订单读取完毕,跳过");
|
||||
break;
|
||||
}
|
||||
Thread.Sleep(Randomx.GetId(5000, 7000));
|
||||
}
|
||||
if (isSkipNext)
|
||||
{
|
||||
@@ -1674,6 +1715,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// order.sendStatus = "";
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("tb_buyer_order_list", lstTbBuyerOrderInfoLite);
|
||||
|
||||
if (order.order_sn == "tb_5127845257228122932")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// 仓库处理中
|
||||
if (order.sendStatus.ParseToString().Contains("仓库处理中"))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user