Compare commits

..
2 Commits
5 changed files with 106 additions and 18 deletions

No files matched your search

@@ -351,6 +351,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
imgLoading.Visibility = Visibility.Visible;
btnSearch.IsEnabled = false;
}));
bool hasGetPage = false;
int page = 0;
int totalPage = 1;
int pageSize = 50;
@@ -360,7 +361,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
{
BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页";
BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页" + (hasGetPage ? "" : ("/共" + totalPage + "页"));
if (page >= totalPage)
{
break;
@@ -416,7 +417,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var totalCount = BaseRegex.GetIntJson(ref html, "count");
if (totalCount > 0)
{
hasGetPage = true;
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
}
else
{
}
@@ -1551,7 +1555,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
public void disPlayOrderTabOrderCount()
public async Task disPlayOrderTabOrderCount()
{
//var orders = string.Join("','", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
@@ -1559,46 +1563,57 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//TabItem tabItem = null;
//List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
var task1 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
WaitBuyTabTxt = "待采购(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
var task2 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
WaitSendTabTxt = "待发货(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
var task3 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
var task4 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
RefundTabTxt = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
await Task.WhenAll(task1, task2, task3, task4);
var task5 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
EmergencyManualReturnOrderTabTxt = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
var task6 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
EmergencyDistribReturnOrderTabTxt = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
var task7 = Task.Run(() =>
{
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
AbnormalTabTxt = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
var task8 = Task.Run(() =>
{
var lstCount = userOrderLst.Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
}
});
await Task.WhenAll(task5, task6, task7, task8);
}
CancellationTokenSource TokenSource = null;
@@ -142,7 +142,7 @@ namespace _29WxOrderWpf.ViewModels
// <AjaxResult><msg>创建额外包裹异常: 用户账户余额不足,需至少 2.20 元用于中转仓取号, userId:17333276316, balance:0.85</msg><code>2</code></AjaxResult>
if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200")
{
BaseMsgWindow.ShowError(BaseRegex.GetStringXml(ref rst, "msg"));
BaseMsgWindow.ShowError("服务端返回:" + BaseRegex.GetStringXml(ref rst, "msg"));
return;
}
@@ -156,7 +156,7 @@ namespace _29WxOrderWpf.ViewModels
// <AjaxResult><msg>额外信息已保存</msg><code>200</code></AjaxResult>
if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200")
{
BaseMsgWindow.ShowError(BaseRegex.GetStringXml(ref rst, "msg"));
BaseMsgWindow.ShowError("服务端返回:" + BaseRegex.GetStringXml(ref rst, "msg"));
return;
}
+1 -1
View File
@@ -28,7 +28,7 @@ namespace AllBase.Model.DBModel
public ShopLoginInfo Shop
{
get { return this.GetValue(x => x.Shop); }
set { this.SetValue(x => x.Shop, value); if (!Shop.ShopAccount.IsNullOrEmpty()) shop_name = Shop.ShopAccount; }
set { this.SetValue(x => x.Shop, value); if (!(Shop?.ShopAccount).IsNullOrEmpty()) shop_name = Shop?.ShopAccount; }
}
public int Index
{
@@ -1241,6 +1241,10 @@ namespace AllBase.Model.DBModel
//get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
FreightVisibility = Visibility.Collapsed;
if (order_id == "3740014218899272960")
{
}
//get { return "¥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
PredictCommissionFeeStr = "¥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00");
@@ -1346,8 +1350,8 @@ namespace AllBase.Model.DBModel
/// </summary>
public string CommissionAmountStr
{
get { return this.GetValue(x => x.PredictCommissionFeeStr); }
set { this.SetValue(x => x.PredictCommissionFeeStr, value); }
get { return this.GetValue(x => x.CommissionAmountStr); }
set { this.SetValue(x => x.CommissionAmountStr, value); }
}
/// <summary>
+72 -3
View File
@@ -611,7 +611,13 @@ namespace TemuKJD.ToolForms
}
}
}
// 填地址
var rst = await ChangeAddress(transit);
// 领优惠券
await AutoGetCoupon();
IsChangeAddress = false;
}
}
@@ -654,7 +660,7 @@ namespace TemuKJD.ToolForms
while (this.Created && IsAutoBuy)
{
Thread.Sleep(100);
if (HasChangeAddress && (this.cefWebBrowser?.GetMainFrame()?.Url).ParseToString().StartsWith("https://mobile.yangkeduo.com/order_checkout.html?sku_id="))
if (!IsChangeAddress && HasChangeAddress && (this.cefWebBrowser?.GetMainFrame()?.Url).ParseToString().StartsWith("https://mobile.yangkeduo.com/order_checkout.html?sku_id="))
{
try
{
@@ -772,7 +778,7 @@ namespace TemuKJD.ToolForms
IBrowserHost host = null;
DevToolsClient client = null;
public async Task<EvaluateResponse> EvaluateJsBuyTagNameAndInnerHtml(string tagName, string innerHTML, bool isClick = false)
public async Task<EvaluateResponse> EvaluateJsBuyTagNameAndInnerHtml(string tagName, string innerHTML, bool isClick = false, bool isOuterHtml = false)
{
if (!this.Created)
throw new Exception("窗口已关闭");
@@ -796,7 +802,7 @@ namespace TemuKJD.ToolForms
var jsStr1 = @"(function() { var elements = document.getElementsByTagName('" + tagName + @"');
for (i = elements.length - 1; i >= 0; i--){
var element = elements[i];
if (element.innerHTML.indexOf('" + innerHTML + @"') >= 0) {";
if (element." + (isOuterHtml ? "outerHTML" : "innerHTML") + @".indexOf('" + innerHTML + @"') >= 0) {";
if (isClick)
jsStr1 += @"element.click();";
jsStr1 += @"
@@ -840,6 +846,69 @@ namespace TemuKJD.ToolForms
}
}
public async Task<string> AutoGetCoupon()
{
for (int i = 0; i < 10; i++)
{
Thread.Sleep(100);
if (host == null || client == null)
{
host = cefWebBrowser?.GetBrowser().GetHost();
client = cefWebBrowser?.GetDevToolsClient();
}
else
break;
}
if (host == null || client == null)
{
throw new Exception("页面加载异常");
}
// 点击领取优惠券
for (int i = 0; i < 20; i++)
{
Thread.Sleep(150);
if (!this.Created) return "窗口已关闭";
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "领券可减", true);
if (ts1.Result.Value is string rstStr && rstStr == "success")
{
break;
}
}
Thread.Sleep(Randomx.GetId(200, 400));
//点击领取优惠券
for (int i = 0; i < 20; i++)
{
Thread.Sleep(150);
if (!this.Created) return "窗口已关闭";
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("div", "领取", true);
if (ts1.Result.Value is string rstStr && rstStr == "success")
{
break;
}
}
Thread.Sleep(Randomx.GetId(200, 400));
// 点击关闭
for (int i = 0; i < 20; i++)
{
Thread.Sleep(150);
if (!this.Created) return "窗口已关闭";
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("div", "aria-label=\"关闭\"", true, true);
if (ts1.Result.Value is string rstStr && rstStr == "success")
{
break;
}
}
Thread.Sleep(Randomx.GetId(200, 400));
return "";
}
/// <summary>
/// 自动填写地址
/// </summary>