1688上传类目转换等优化 充值用户服务充值和用户续费店铺功能
This commit is contained in:
1 parent
ecb291e3d7
commit
aab73b978f
56 files changed
+4532
-1748
No files matched your search
@@ -36,6 +36,7 @@ using TemuKJD.Helper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using CefSharp;
|
||||
using TemuKJD.WXForms.ProductForms;
|
||||
using CefSharp.WinForms;
|
||||
|
||||
namespace TemuKJD.WXForms.OrderForms
|
||||
{
|
||||
@@ -61,6 +62,8 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
|
||||
private void UserSelectDbProductForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
btnClearFilter_Click(null, null);
|
||||
|
||||
dgvOrder.AddMergeColumn(new List<string>() { "colOrderStatus" , "colUpdateStatus" });
|
||||
dgvOrder.AddMergeColumnHeader(new List<string>() { "colOrderStatus" , "colUpdateStatus" }, "订单状态");
|
||||
|
||||
@@ -203,7 +206,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
{
|
||||
if (shopEntity == null)
|
||||
return;
|
||||
if (shopEntity.is_shop_expire)
|
||||
if (shopEntity.is_point_shop_expire)
|
||||
return;
|
||||
if (selectShopId == null)
|
||||
selectShopId = new List<string>();
|
||||
@@ -347,6 +350,38 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
}
|
||||
}
|
||||
|
||||
private void dgvOrder_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (e.ColumnIndex < 0 || e.RowIndex < 0)
|
||||
return;
|
||||
string headerText = dgvOrder.Columns[e.ColumnIndex].HeaderText;
|
||||
var shopId = dgvOrder.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
|
||||
var spuId = dgvOrder.Rows[e.RowIndex].Cells["colSpuId"].Value.ParseToString();
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
var row = dgvOrder.Rows[e.RowIndex];
|
||||
var cell = row.Cells[e.ColumnIndex];
|
||||
var orderId = row.Cells["colOrderId"].Value.ParseToString();
|
||||
switch (headerText)
|
||||
{
|
||||
case "采购地址":
|
||||
string buyUrl = row.Cells["colBuyUrl"].Value.ParseToString();
|
||||
if (!string.IsNullOrEmpty(buyUrl))
|
||||
{
|
||||
Clipboard.SetText(buyUrl);
|
||||
statusBar.lblTaskStatus.Text = "店铺 " + shop.ShopAccount + " 订单 " + orderId + " 采购地址复制成功";
|
||||
}
|
||||
break;
|
||||
case "收货信息":
|
||||
string receiveInfo = row.Cells["colReceiveInfo"].Value.ParseToString();
|
||||
if (!string.IsNullOrEmpty(receiveInfo))
|
||||
{
|
||||
Clipboard.SetText(row.Cells["colReceiveInfo"].Value.ParseToString());
|
||||
statusBar.lblTaskStatus.Text = "店铺 " + shop.ShopAccount + " 订单 " + orderId + " 收货信息复制成功";
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (e.ColumnIndex < 0 || e.RowIndex < 0)
|
||||
@@ -602,55 +637,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
return;
|
||||
}
|
||||
|
||||
var deRst = "测试地址写入{\"code\"0}";
|
||||
deRst = WXOrderList.decryptOrder(shop, orderId);
|
||||
if (deRst.Contains("\"code\":0"))
|
||||
{
|
||||
var url = BaseClass.BuildObjString("shop/wx_add_mdy_order_address");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&shop_id=" + shop.ShopId;
|
||||
data += "&order_id=" + orderId;
|
||||
data += "&order_address=" + GetHtml.UrlEncodeUtf8(deRst);
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (!html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (!html.Contains("\"code\":200"))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach (var rw in rows)
|
||||
{
|
||||
rw.Cells["colOpResult"].Value = errMsg;
|
||||
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
|
||||
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
|
||||
}
|
||||
BaseMsgForm.ShowError("查看地址成功但保存到服务端失败:" + errMsg);
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach(var rw in rows)
|
||||
{
|
||||
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
|
||||
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
|
||||
rw.Cells["colOpResult"].Value = "查看地址成功";
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
|
||||
BaseMsgForm.ShowError("查看地址失败:" + error);
|
||||
}));
|
||||
}
|
||||
//Invoke(new Action(() => { cell.Value = "👁"; }));
|
||||
ShowOrderAddress(shop, orderId, row);
|
||||
Invoke(new Action(() => { pbLoading.Visible = false; }));
|
||||
});
|
||||
}
|
||||
@@ -686,6 +673,18 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
Task.Run(() =>
|
||||
{
|
||||
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
|
||||
if (!row.Cells["colReceiveInfo"].Value.ParseToString().Contains("未查看地址"))
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach (var rw in rows)
|
||||
{
|
||||
rw.Cells["colOpResult"].Value = "已获取地址,请勿重复打印";
|
||||
}
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
var currentStatus = UpdateOrderStatus(shop, orderId);
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
@@ -699,7 +698,26 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
BaseMsgForm.ShowError("订单状态已变化,请勿拍单");
|
||||
return;
|
||||
}
|
||||
|
||||
if (row.Cells["colDecrypt"].Value.ParseToString() != "❌")
|
||||
{
|
||||
ShowOrderAddress(shop, orderId, row, false);
|
||||
}
|
||||
|
||||
if (!row.Cells["colReceiveInfo"].Value.ParseToString().Contains("未查看地址"))
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach (var rw in rows)
|
||||
{
|
||||
rw.Cells["colOpResult"].Value = "已获取地址,请勿重复打印";
|
||||
}
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
GetOnlineWayBill(shop, row);
|
||||
|
||||
});
|
||||
}
|
||||
break;
|
||||
@@ -735,14 +753,90 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
}
|
||||
}
|
||||
|
||||
void ShowOrderAddress(ShopLoginInfo shop, string orderId, DataGridViewRow row, bool ShowErrorDialog = true)
|
||||
{
|
||||
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
|
||||
var deRst = "测试地址写入{\"code\"0}";
|
||||
deRst = WXOrderList.decryptOrder(shop, orderId);
|
||||
if (deRst.Contains("\"code\":0"))
|
||||
{
|
||||
var url = BaseClass.BuildObjString("shop/wx_add_mdy_order_address");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&shop_id=" + shop.ShopId;
|
||||
data += "&order_id=" + orderId;
|
||||
data += "&order_address=" + GetHtml.UrlEncodeUtf8(deRst);
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (!html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (!html.Contains("\"code\":200"))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach (var rw in rows)
|
||||
{
|
||||
rw.Cells["colOpResult"].Value = errMsg;
|
||||
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
|
||||
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
|
||||
}
|
||||
if (ShowErrorDialog)
|
||||
BaseMsgForm.ShowError("查看地址成功但保存到服务端失败:" + errMsg);
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach (var rw in rows)
|
||||
{
|
||||
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
|
||||
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
|
||||
rw.Cells["colOpResult"].Value = "查看地址成功";
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
|
||||
if (error.Contains("\"code\":17899002") || error.Contains("\"code\":10020123"))
|
||||
{
|
||||
if (error.Contains("\"code\":17899002"))
|
||||
error = "基于用户隐私保护,无法查看收货信息";
|
||||
if (error.Contains("\"code\":10020123"))
|
||||
error = "今日查看次数已用完";
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
foreach (var rw in dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId).ToList())
|
||||
{
|
||||
rw.Cells["colDecrypt"].Value = "❌";
|
||||
if (rw.Cells["colReceiveInfo"].Value.ParseToString().Contains("未查看地址"))
|
||||
rw.Cells["colOpResult"].Value = "查看地址失败:" + error;
|
||||
}
|
||||
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
|
||||
if (ShowErrorDialog)
|
||||
BaseMsgForm.ShowError("查看地址失败:" + error);
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
|
||||
if (ShowErrorDialog)
|
||||
BaseMsgForm.ShowError("查看地址失败:" + error);
|
||||
}));
|
||||
}
|
||||
}
|
||||
//Invoke(new Action(() => { cell.Value = "👁"; }));
|
||||
}
|
||||
|
||||
void GetOnlineWayBill(ShopLoginInfo shop, DataGridViewRow row)
|
||||
{
|
||||
var orderId = row.Cells["colOrderId"].Value.ParseToString();
|
||||
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
while (isOnlineWayBill)
|
||||
Thread.Sleep(150);
|
||||
for (int i = 0; i < 50 && isOnlineWayBill; i++)
|
||||
Thread.Sleep(200);
|
||||
|
||||
Invoke(new Action(() => { pbLoading.Visible = true; }));
|
||||
isOnlineWayBill = true;
|
||||
@@ -900,36 +994,44 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
}
|
||||
}
|
||||
|
||||
WXShopLoginForm form = null;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (shop.Chat == null)
|
||||
{
|
||||
shop.Chat = CEFBrowser.CreateChromiumWebBrowser("https://store.weixin.qq.com/shop/waybill/allToAll", false);
|
||||
CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
|
||||
resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
|
||||
resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
|
||||
shop.Chat.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
|
||||
var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
|
||||
shop.Chat.LifeSpanHandler = lifeSapnHandler;
|
||||
shop.Chat.KeyboardHandler = new KeyboardHandler();
|
||||
shop.Chat.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
|
||||
shop.Chat.AddressChanged += CefWebBrowser_AddressChanged;
|
||||
shop.Chat.LoadError += CefWebBrowser_LoadError;
|
||||
shop.Chat.Dock = DockStyle.Fill;
|
||||
MainForm.instance.cefPanel.Controls.Add(shop.Chat);
|
||||
}
|
||||
//if (shop.Chat == null)
|
||||
//{
|
||||
// shop.Chat = CEFBrowser.CreateChromiumWebBrowser("https://store.weixin.qq.com/shop/waybill/allToAll", false);
|
||||
// CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
|
||||
// resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
|
||||
// resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
|
||||
// shop.Chat.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
|
||||
// var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
|
||||
// shop.Chat.LifeSpanHandler = lifeSapnHandler;
|
||||
// shop.Chat.KeyboardHandler = new KeyboardHandler();
|
||||
// shop.Chat.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
|
||||
// shop.Chat.AddressChanged += CefWebBrowser_AddressChanged;
|
||||
// shop.Chat.LoadError += CefWebBrowser_LoadError;
|
||||
// shop.Chat.Dock = DockStyle.Fill;
|
||||
// MainForm.instance.cefPanel.Controls.Add(shop.Chat);
|
||||
//}
|
||||
//shop.Chat.SendToBack();
|
||||
|
||||
form = new WXShopLoginForm(shop);
|
||||
form.openType = EnumOpenType.manage;
|
||||
form.InitUrl = "https://store.weixin.qq.com/shop/waybill/allToAll";
|
||||
form.TopLevel = false;
|
||||
MainForm.instance.cefPanel.Controls.Add(form);
|
||||
form.Show();
|
||||
|
||||
shop.Chat.SendToBack();
|
||||
//MainForm.instance.cefPanel.BringToFront();
|
||||
MainForm.instance.cefPanel.SendToBack();
|
||||
MainForm.instance.cefPanel.Visible = true;
|
||||
}));
|
||||
while (!shop.Chat.IsBrowserInitialized)
|
||||
while (form.cefWebBrowser == null || !form.cefWebBrowser.IsBrowserInitialized)
|
||||
Thread.Sleep(100);
|
||||
CEFBrowser.DeleteCookie(shop.Chat.GetCookieManager(null));
|
||||
CEFBrowser.DeleteCookie(form.cefWebBrowser.GetCookieManager(null));
|
||||
var cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(shop.Cookies);
|
||||
var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), shop.Chat.GetCookieManager(null));
|
||||
shop.Chat.Load("https://store.weixin.qq.com/shop/waybill/allToAll");
|
||||
var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), form.cefWebBrowser.GetCookieManager(null));
|
||||
form.cefWebBrowser.Load("https://store.weixin.qq.com/shop/waybill/allToAll");
|
||||
|
||||
var jsStr = @"(function() {
|
||||
const element = document.getElementsByName('waybill')[0];
|
||||
@@ -951,7 +1053,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
Thread.Sleep(250);
|
||||
var client = shop.Chat.GetDevToolsClient();
|
||||
var client = form.cefWebBrowser.GetDevToolsClient();
|
||||
if (client != null)
|
||||
{
|
||||
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
@@ -985,7 +1087,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
Thread.Sleep(250);
|
||||
var client = shop.Chat.GetDevToolsClient();
|
||||
var client = form.cefWebBrowser.GetDevToolsClient();
|
||||
if (client != null)
|
||||
{
|
||||
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
@@ -1020,7 +1122,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
Thread.Sleep(500);
|
||||
var client = shop.Chat.GetDevToolsClient();
|
||||
var client = form.cefWebBrowser.GetDevToolsClient();
|
||||
if (client != null)
|
||||
{
|
||||
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
@@ -1057,7 +1159,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
Thread.Sleep(500);
|
||||
var client = shop.Chat.GetDevToolsClient();
|
||||
var client = form.cefWebBrowser.GetDevToolsClient();
|
||||
if (client != null)
|
||||
{
|
||||
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||
@@ -1075,9 +1177,11 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
|
||||
isOnlineWayBill = false;
|
||||
|
||||
//#endif
|
||||
Invoke(new Action(() => { pbLoading.Visible = false; }));
|
||||
//});
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
form.Close();
|
||||
pbLoading.Visible = false;
|
||||
}));
|
||||
}
|
||||
|
||||
private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
|
||||
@@ -1204,7 +1308,15 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
|
||||
// 查找订单
|
||||
pageSize = 30;
|
||||
var result = WXOrderList.orderListSearch(shop, orderStatus, page, pageSize);
|
||||
long? startTime = null;
|
||||
long? endTime = null;
|
||||
if (chkTimeDuration.Checked)
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
startTime = BaseClass.DateTimeToTimestampMilliseconds(dtpStartTime.Value);
|
||||
endTime = BaseClass.DateTimeToTimestampMilliseconds(dtpEndTime.Value);
|
||||
}));
|
||||
var result = WXOrderList.orderListSearch(shop, orderStatus, page, pageSize, startTime, endTime);
|
||||
if (!result.Contains("\"code\":0"))
|
||||
{
|
||||
ShowShopError(shop, result);
|
||||
@@ -1389,7 +1501,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
|
||||
"", // 在线寄件打印单号
|
||||
order.expressData?.type == 3 && order.expressData?.status != 1 ? order.expressData?.jumpPath?.Substring((order.expressData?.jumpPath).ParseToString().IndexOf("ewaybillOrderId=")).Replace("ewaybillOrderId=", "") : "",
|
||||
order.expressData?.type == 3 && order.expressData?.status != 1 ? "再次\r\n打印" : "打印",
|
||||
order.expressData?.type == 3 && order.expressData?.status != 1 ? "再次\r\n打印" : "打印",
|
||||
|
||||
order.flagInfo.flagNotes, // 卖家备注
|
||||
order.flagInfo.flagColor, // 卖家备注颜色
|
||||
@@ -1468,6 +1580,9 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
{
|
||||
chkHasSend.Checked = true;
|
||||
chkWaitSend.Checked = true;
|
||||
chkTimeDuration.Checked = false;
|
||||
dtpStartTime.Value = DateTime.Now.Date;
|
||||
dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
|
||||
}
|
||||
|
||||
private void btnFilterShop_Click(object sender, EventArgs e)
|
||||
@@ -1688,20 +1803,49 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
private void btnNotesOK_Click(object sender, EventArgs e)
|
||||
{
|
||||
var orderIds = lblOrderId.Text.Split(';');
|
||||
var orderIdStr = lblOrderId.Text;
|
||||
|
||||
if (cancellationTokenSource != null)
|
||||
cancellationTokenSource.Cancel();
|
||||
cancellationTokenSource = new CancellationTokenSource();
|
||||
Task.Run(() =>
|
||||
{
|
||||
int index = 0;
|
||||
foreach (var orderId in orderIds)
|
||||
{
|
||||
index++;
|
||||
if (orderIdStr.Contains(";"))
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.statusBar.lblTaskStatus.Text = "正在修改备注 " + index + "/" + orderIds.Length;
|
||||
}));
|
||||
if (cancellationTokenSource.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
var notes = txtNotes.Text.Trim();
|
||||
var tagColor = lblColorTag.Text.ParseToInt();
|
||||
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId).ToList();
|
||||
if (rows.Count == 0)
|
||||
continue;
|
||||
|
||||
// 批量备注跳过已备注内容
|
||||
if (chkSkipHasNotesOrder.Checked && orderIdStr.Contains(";") && !rows[0].Cells["colNotes"].Value.ParseToString().IsNullOrEmpty())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == rows[0].Cells["colSupplierId"].Value.ParseToString());
|
||||
if (shop != null)
|
||||
{
|
||||
var notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
|
||||
{
|
||||
if (notesRst.Contains("请求超过频率限制"))
|
||||
{
|
||||
Thread.Sleep(8000);
|
||||
notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
|
||||
}
|
||||
}
|
||||
Thread.Sleep(Randomx.GetId(300, 500));
|
||||
if (notesRst.Contains("\"code\":0"))
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
@@ -1727,15 +1871,21 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowShopError(shop, notesRst, true);
|
||||
foreach (var row in rows)
|
||||
{
|
||||
var err = BaseRegex.GetStringJsonByRegs(ref notesRst, notesRst, "msg", "errMsg", "err_msg", "errorMsg", "error_msg");
|
||||
row.Cells["colOpResult"].Value = "修改备注失败 " + err;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
pnlUpdateNotes.Visible = false;
|
||||
if (orderIdStr.Contains(";"))
|
||||
this.statusBar.lblTaskStatus.Text = "备注已修改" + index + "/" + orderIds.Length;
|
||||
}));
|
||||
});
|
||||
}, cancellationTokenSource.Token);
|
||||
}
|
||||
|
||||
private void btnEditReceiveInfoCancel_Click(object sender, EventArgs e)
|
||||
@@ -1955,6 +2105,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
|
||||
row.Visible = true;
|
||||
}
|
||||
this.lblOrderCount.Text = "当前展示订单:" + this.dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Visible == true).Count().ToString() + " 条";
|
||||
}
|
||||
|
||||
private void btnRestore_Click(object sender, EventArgs e)
|
||||
@@ -1981,6 +2132,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
{
|
||||
ShowRefreshPrintId(row);
|
||||
}
|
||||
BaseMsgForm.ShowInfo("已刷新");
|
||||
}
|
||||
|
||||
void GetRefreshPrintId()
|
||||
@@ -2056,6 +2208,7 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
continue;
|
||||
}
|
||||
|
||||
Thread.Sleep(6000);
|
||||
GetOnlineWayBill(shop, row);
|
||||
}
|
||||
}
|
||||
@@ -2108,6 +2261,25 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
ShowShopError(shop, rst);
|
||||
return "获取\r\n失败";
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// 更新备注信息
|
||||
var jArr = JsonHelper.JObjectParse(rst)["orderList"];
|
||||
var orderLst = JsonHelper.DeserializeJsonToList<WxOrderInfoLite>(JsonHelper.SerializeObject(jArr));
|
||||
var row = dgvOrder.Rows.Cast<DataGridViewRow>().ToList().FirstOrDefault(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
|
||||
if (row != null)
|
||||
{
|
||||
row.Cells["colNotes"].Value = BaseRegex.GetStringJson(ref rst, "flagNotes").ParseToString();
|
||||
row.Cells["colNotesColor"].Value = BaseRegex.GetStringJson(ref rst, "flagColor").ParseToInt();
|
||||
ShowDgvRow(row, orderLst.FirstOrDefault());
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ShowShopError(shop, ex.Message);
|
||||
}
|
||||
|
||||
var statusStr = BaseRegex.GetStringJson(ref rst, "statusStr");
|
||||
if (string.IsNullOrEmpty(statusStr))
|
||||
statusStr = "不存在";
|
||||
@@ -2145,6 +2317,16 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
ucCheckBox4.Checked = lblColorTag.Text == "3";
|
||||
ucCheckBox5.Checked = lblColorTag.Text == "4";
|
||||
}
|
||||
|
||||
private void dgvOrder_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
|
||||
{
|
||||
this.lblOrderCount.Text = "当前展示订单:" + this.dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Visible == true).Count().ToString() + " 条";
|
||||
}
|
||||
|
||||
private void dgvOrder_RowsRemoved(object sender, DataGridViewRowsRemovedEventArgs e)
|
||||
{
|
||||
this.lblOrderCount.Text = "当前展示订单:" + this.dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Visible == true).Count().ToString() + " 条";
|
||||
}
|
||||
}
|
||||
|
||||
public class WXOrderList
|
||||
@@ -2155,16 +2337,27 @@ namespace TemuKJD.WXForms.OrderForms
|
||||
/// <param name="shop"></param>
|
||||
/// <param name="orderStatus">订单状态 20待发货 30已发货</param>
|
||||
/// <returns></returns>
|
||||
public static string orderListSearch(ShopLoginInfo shop, int orderStatus = 20, int pageNum = 1, int pageSize = 30)
|
||||
public static string orderListSearch(ShopLoginInfo shop, int orderStatus = 20, int pageNum = 1, int pageSize = 30, long? timeStart = null, long? timeEnd = null)
|
||||
{
|
||||
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
|
||||
string body = @"{""isSearch"":false,""pageSize"":" + pageSize +
|
||||
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":" + 1 +
|
||||
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1" +
|
||||
@",""onAftersaleOrderExist"":0,""orderStatus"":" + orderStatus + @"}";
|
||||
if (pageNum > 1)
|
||||
body = @"{""isSearch"":false,""pageSize"":" + pageSize +
|
||||
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":" + 1 +
|
||||
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1" +
|
||||
@",""onAftersaleOrderExist"":0,""orderStatus"":" + orderStatus + @",""page"":" + pageNum + @"}";
|
||||
|
||||
//@"{""isSearch"":true,""pageSize"":30,""orderId"":"""",""orderTime"":{""type"":0,""time"":[1777564800000,1779379200000]},""telNumber"":"""",""title"":"""",""receiverName"":"""",""finderNickName"":"""",""merchantNotes"":"""",""merchantNotesTagColor"":0,""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",""page"":1,""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1,""onAftersaleOrderExist"":0,""orderStatus"":30,""startCreateTime"":1777564800000,""endCreateTime"":1779379200000}";
|
||||
|
||||
if (timeStart != null && timeEnd != null)
|
||||
body = @"{""isSearch"":true,""pageSize"":30,""orderId"":"""",""orderTime"":{""type"":0,""time"":[" + timeStart + @"," + timeEnd + @"]},
|
||||
""telNumber"":"""",""title"":"""",""receiverName"":"""",""finderNickName"":"""",""merchantNotes"":"""",""merchantNotesTagColor"":0,
|
||||
""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,
|
||||
""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",""page"":" + pageNum + @",""overTime"":0,""pengingShipOneDay"":0,
|
||||
""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1,""onAftersaleOrderExist"":0,
|
||||
""orderStatus"":" + orderStatus + @",""startCreateTime"":" + timeStart + @",""endCreateTime"":" + timeEnd + @"}";
|
||||
|
||||
string refere = "https://store.weixin.qq.com/shop/order/list";
|
||||
var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere);
|
||||
return result;
|
||||
|
||||
Reference in new issue
Block a user