1中转仓订单退货功能 2中转仓订单运费根据oem或管理员设定调整 3其他一些问题修复
This commit is contained in:
1 parent
d6f81f9ef4
commit
2e20cbdf68
24 files changed
+834
-292
No files matched your search
@@ -23,6 +23,7 @@ using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices.ComTypes;
|
||||
using System.Security.Policy;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@@ -40,6 +41,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
public bool IsAutoBuy { get; set; } = true;
|
||||
public bool IsFormLoad { get; set; } = false;
|
||||
public bool ShowBuyMask { get; set; } = false;
|
||||
|
||||
public int CloseAfterSecond { get; set; }
|
||||
public string InitUrl = "";
|
||||
@@ -98,6 +100,27 @@ namespace TemuKJD.ToolForms
|
||||
});
|
||||
}
|
||||
|
||||
if (this.ShowBuyMask == true)
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
for (int i = 3; i > 0; i--)
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.pnlMask.Visible = true;
|
||||
this.pnlMask.Text = "自动拍单倒计时\r\n" + i;
|
||||
}));
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.pnlMask.Visible = false;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
if (buyMap != null)
|
||||
{
|
||||
@@ -173,6 +196,7 @@ namespace TemuKJD.ToolForms
|
||||
cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged;
|
||||
cefWebBrowser.LoadError += CefWebBrowser_LoadError;
|
||||
cefWebBrowser.Dock = DockStyle.Fill;
|
||||
cefWebBrowser.SendToBack();
|
||||
|
||||
//js绑定C#对象
|
||||
//PDDShopBrowserObject shopObj = new PDDShopBrowserObject();
|
||||
@@ -283,7 +307,11 @@ namespace TemuKJD.ToolForms
|
||||
//static int GetAntiContentsTimes = 40;
|
||||
private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
|
||||
{
|
||||
Task.Run(() => { DoResourceLoadComplete(url, postData, responseData); });
|
||||
}
|
||||
|
||||
public void DoResourceLoadComplete(string url, string postData, string responseData)
|
||||
{
|
||||
if (url.StartsWith("https://mobile.yangkeduo.com/order_checkout.html") && responseData.Contains("该商品已下架"))
|
||||
{
|
||||
IsSoldOut = true;
|
||||
@@ -348,12 +376,12 @@ namespace TemuKJD.ToolForms
|
||||
this.cmbTransitWarehouse.Text = "";
|
||||
|
||||
// 自动填写拍单信息界面
|
||||
this.txtBuyGoodsId.Text = goodsId.ParseToString();
|
||||
this.txtBuySkuId.Text = skuId.ParseToString();
|
||||
this.txtBuyGoodsName.Text = goodsName;
|
||||
this.txtBuySkuName.Text = spec;
|
||||
this.txtBuyCnt.Text = buyCnt.ParseToString();
|
||||
this.txtBuyPrice.Text = (buyPrice * 0.01m).ParseToString();
|
||||
if (!goodsId.IsNullOrZero()) this.txtBuyGoodsId.Text = goodsId.ParseToString();
|
||||
if (!skuId.IsNullOrZero()) this.txtBuySkuId.Text = skuId.ParseToString();
|
||||
if (!goodsName.IsNullOrEmpty()) this.txtBuyGoodsName.Text = goodsName;
|
||||
if (!spec.IsNullOrEmpty()) this.txtBuySkuName.Text = spec;
|
||||
if (!buyCnt.IsNullOrZero()) this.txtBuyCnt.Text = buyCnt.ParseToString();
|
||||
if (!buyPrice.IsNullOrZero()) this.txtBuyPrice.Text = (buyPrice * 0.01m).ParseToString();
|
||||
}));
|
||||
});
|
||||
}
|
||||
@@ -392,12 +420,12 @@ namespace TemuKJD.ToolForms
|
||||
var buyPrice = BaseRegex.GetIntJson(ref data, "pay_price");
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.txtBuyGoodsId.Text = goodsId.ParseToString();
|
||||
this.txtBuySkuId.Text = skuId.ParseToString();
|
||||
this.txtBuyGoodsName.Text = goodsName;
|
||||
this.txtBuySkuName.Text = spec;
|
||||
this.txtBuyCnt.Text = buyCnt.ParseToString();
|
||||
this.txtBuyPrice.Text = (buyPrice * 0.01m).ParseToString();
|
||||
if (!goodsId.IsNullOrZero()) this.txtBuyGoodsId.Text = goodsId.ParseToString();
|
||||
if (!skuId.IsNullOrZero()) this.txtBuySkuId.Text = skuId.ParseToString();
|
||||
if (!goodsName.IsNullOrEmpty()) this.txtBuyGoodsName.Text = goodsName;
|
||||
if (!spec.IsNullOrEmpty()) this.txtBuySkuName.Text = spec;
|
||||
if (!buyCnt.IsNullOrZero()) this.txtBuyCnt.Text = buyCnt.ParseToString();
|
||||
if (!buyPrice.IsNullOrZero()) this.txtBuyPrice.Text = (buyPrice * 0.01m).ParseToString();
|
||||
}));
|
||||
|
||||
Invoke(new Action(() =>
|
||||
@@ -406,12 +434,12 @@ namespace TemuKJD.ToolForms
|
||||
var transit = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransDetailAddress == txtBuyTransitWarehouse.Text.Trim());
|
||||
if (transit != null && IsChangeAddress == false && HasChangeAddress == false)
|
||||
{
|
||||
if(!IsSoldOut)
|
||||
if (!IsSoldOut)
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
IsChangeAddress = true;
|
||||
Thread.Sleep(1000);
|
||||
Thread.Sleep(100);
|
||||
var sourceCodeRst = GetSourceCode(transit);
|
||||
if (sourceCodeRst.Contains("失败"))
|
||||
{
|
||||
@@ -445,14 +473,16 @@ namespace TemuKJD.ToolForms
|
||||
}
|
||||
|
||||
// 订单提交接口
|
||||
//https://mobile.yangkeduo.com/proxy/api/order/prepay?pdduid=8161628055192
|
||||
if (url.StartsWith("https://mobile.yangkeduo.com/proxy/api/order/prepay?pdduid="))
|
||||
{
|
||||
var data = postData;
|
||||
Task.Run(() =>
|
||||
{
|
||||
var data = postData;
|
||||
Invoke(new Action(() =>
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
txtBuyOrderId.Text = BaseRegex.GetStringJson(ref data, "order_sn");
|
||||
//txtBuyOrderId.Text = BaseRegex.GetStringJson(ref data, "order_sn");
|
||||
txtBuyOrderId.Text = BaseRegex.GetStringJsonByRegs(ref data, "", "order_sn", "orderSn");
|
||||
}));
|
||||
});
|
||||
}
|
||||
@@ -508,9 +538,19 @@ namespace TemuKJD.ToolForms
|
||||
/// <returns></returns>
|
||||
public string ChangeAddress(TransitWarehouseParam transit)
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
Thread.Sleep(200);
|
||||
var host = cefWebBrowser.GetBrowser().GetHost();
|
||||
var client = cefWebBrowser.GetDevToolsClient();
|
||||
for (int i = 0; i < 20; i++)
|
||||
{
|
||||
Thread.Sleep(50);
|
||||
if (host == null || client == null)
|
||||
{
|
||||
host = cefWebBrowser.GetBrowser().GetHost();
|
||||
client = cefWebBrowser.GetDevToolsClient();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (host == null || client == null)
|
||||
{
|
||||
return "页面未加载";
|
||||
@@ -521,53 +561,99 @@ namespace TemuKJD.ToolForms
|
||||
//for (i=0; i< elements.length;i++){
|
||||
// var element = elements[i];
|
||||
// if (element.outerHTML.indexOf('当前收货地址为') >= 0) {
|
||||
element.click();
|
||||
element.click();
|
||||
return 'success';
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
})();";
|
||||
var ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
for (int i = 0; i < 20; i++)
|
||||
{
|
||||
if (ts1.Result.Result.Value is string rstStr)
|
||||
{
|
||||
if (rstStr == "success")
|
||||
break;
|
||||
}
|
||||
Thread.Sleep (100);
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
}
|
||||
//Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
Thread.Sleep(Randomx.GetId(300, 500));
|
||||
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('span');
|
||||
for (i=0; i< elements.length;i++){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('修改') == 0) {
|
||||
element.click();
|
||||
break;
|
||||
return 'success';
|
||||
}
|
||||
}
|
||||
})();";
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
for (int i = 0; i < 20; i++)
|
||||
{
|
||||
if (ts1.Result.Result.Value is string rstStr)
|
||||
{
|
||||
if (rstStr == "success")
|
||||
break;
|
||||
}
|
||||
Thread.Sleep(100);
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
}
|
||||
//Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
Thread.Sleep(Randomx.GetId(300, 500));
|
||||
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('span');
|
||||
for (i=0; i< elements.length;i++){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('保存') == 0) {
|
||||
element.click();
|
||||
break;
|
||||
return 'success';
|
||||
}
|
||||
}
|
||||
})();";
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
for (int i = 0; i < 20; i++)
|
||||
{
|
||||
if (ts1.Result.Result.Value is string rstStr)
|
||||
{
|
||||
if (rstStr == "success")
|
||||
break;
|
||||
}
|
||||
Thread.Sleep(100);
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
}
|
||||
//Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
Thread.Sleep(Randomx.GetId(300, 500));
|
||||
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
|
||||
for (i = elements.length - 1; i >= 0; i--){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('" + txtBuyTransitWarehouse.Text.Trim() + @"') >= 0) {
|
||||
element.click();
|
||||
break;
|
||||
return 'success';
|
||||
}
|
||||
}
|
||||
})();";
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
for (int i = 0; i < 20; i++)
|
||||
{
|
||||
if (ts1.Result.Result.Value is string rstStr)
|
||||
{
|
||||
if (rstStr == "success")
|
||||
break;
|
||||
}
|
||||
Thread.Sleep(100);
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
}
|
||||
//Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
Thread.Sleep(Randomx.GetId(300, 500));
|
||||
|
||||
return "";
|
||||
}
|
||||
@@ -808,6 +894,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
body["userName"] = BaseClass.UserName; // 软件端用户名
|
||||
body["purchaserNote"] = BaseClass.UserName + "-" + BaseClass.NickName; // 购买软件账户备注
|
||||
body["postage"] = (BaseClass.PostagePerOrder * 100).ParseToInt() + "";
|
||||
}
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
@@ -855,6 +942,7 @@ namespace TemuKJD.ToolForms
|
||||
out_order_no = txtBuyOrderId.Text.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
});
|
||||
orderItem.SetTransitOrder();
|
||||
// 利润计算重置为最小值,控件Resource更新时将计算利润
|
||||
orderItem.ProfitCount = decimal.MinValue;
|
||||
var order = orderItem.ItemOrder;
|
||||
|
||||
Reference in new issue
Block a user