订单管理功能继续优化

This commit is contained in:
wule_5900x committed 2026-05-24 23:54:48 +08:00
1 parent abdc09afa1
commit ecb291e3d7
8 files changed
+439 -215

No files matched your search

+229 -62
View File
@@ -61,6 +61,9 @@ namespace TemuKJD.WXForms.OrderForms
private void UserSelectDbProductForm_Load(object sender, EventArgs e)
{
dgvOrder.AddMergeColumn(new List<string>() { "colOrderStatus" , "colUpdateStatus" });
dgvOrder.AddMergeColumnHeader(new List<string>() { "colOrderStatus" , "colUpdateStatus" }, "订单状态");
this.splitContainer1.Dock = DockStyle.Fill;
pnlEditReceiveInfo.Location = new Point(pnlUpdateNotes.Location.X, pnlUpdateNotes.Location.Y);
pnlBuyUrl.Location = new Point(pnlUpdateNotes.Location.X, pnlUpdateNotes.Location.Y);
@@ -95,8 +98,8 @@ namespace TemuKJD.WXForms.OrderForms
this.dgvOrder.Columns["colOnlineWaybillOrderId"].Visible = true;
this.dgvOrder.Columns["colOnlineWaybill"].Visible = true;
this.btnRefreshPrintId.Visible = true;
this.btnBatchOnlieWaybill.Visible = true;
this.btnStopBatchOnlieWaybill.Visible = true;
//this.btnBatchOnlieWaybill.Visible = true;
//this.btnStopBatchOnlieWaybill.Visible = true;
}
else
{
@@ -353,6 +356,7 @@ namespace TemuKJD.WXForms.OrderForms
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)
@@ -556,7 +560,6 @@ namespace TemuKJD.WXForms.OrderForms
pnlEditReceiveInfo.Visible = false;
pnlBuyUrl.Visible = false;
lblShopName.Text = shop.ShopAccount;
lblShopId.Text = shop.ShopId;
lblOrderId.Text = orderId;
txtNotes.Text = row.Cells["colNotes"].Value.ParseToString();
lblColorTag.Text = row.Cells["colNotesColor"].Value.ParseToString();
@@ -579,39 +582,77 @@ namespace TemuKJD.WXForms.OrderForms
break;
case "👁":
{
var deRst = "测试地址写入{\"code\"0}";
deRst = WXOrderList.decryptOrder(shop, orderId);
if (deRst.Contains("\"code\":0"))
//cell.Value = "查询中…";
pbLoading.Visible = true;
Task.Run(() =>
{
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 rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
var currentStatus = UpdateOrderStatus(shop, orderId);
Invoke(new Action(() =>
{
var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
BaseMsgForm.ShowError("查看地址成功但保存到服务端失败:" + errMsg);
row.Cells["colOpResult"].Value = errMsg;
row.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
row.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
foreach (var rw in rows)
{
rw.Cells["colOrderStatus"].Value = currentStatus;
}
}));
if (currentStatus != "待发货" && currentStatus != "已发货")
{
Invoke(new Action(() => { pbLoading.Visible = false; }));
BaseMsgForm.ShowError("订单状态已变化,请勿拍单");
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
{
row.Cells["colOpResult"].Value = "查看地址成功";
row.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
row.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
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);
}));
}
}
else
{
var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
BaseMsgForm.ShowError("查看地址失败:" + error);
}
//Invoke(new Action(() => { cell.Value = "👁"; }));
Invoke(new Action(() => { pbLoading.Visible = false; }));
});
}
break;
case "填":
@@ -642,7 +683,48 @@ namespace TemuKJD.WXForms.OrderForms
break;
case "打印":
{
Task.Run(() => { GetOnlineWayBill(shop, row); });
Task.Run(() =>
{
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
var currentStatus = UpdateOrderStatus(shop, orderId);
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colOrderStatus"].Value = currentStatus;
}
}));
if (currentStatus != "待发货" && currentStatus != "已发货")
{
BaseMsgForm.ShowError("订单状态已变化,请勿拍单");
return;
}
GetOnlineWayBill(shop, row);
});
}
break;
case "刷新":
{
pbLoading.Visible = true;
Task.Run(() =>
{
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
var currentStatus = UpdateOrderStatus(shop, orderId);
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colOrderStatus"].Value = currentStatus;
rw.Cells["colOpResult"].Value = "订单刷新:" + DateTime.Now.ToString("HH:mm:ss");
}
pbLoading.Visible = false;
}));
if (currentStatus != "待发货" && currentStatus != "已发货")
{
BaseMsgForm.ShowError("订单状态已变化,请勿拍单");
return;
}
});
}
break;
case "":
@@ -1030,7 +1112,8 @@ namespace TemuKJD.WXForms.OrderForms
{
return sourceOrderAddressStr;
}
return userName + "(" + extension + ")," + virtualNumber + "-" + extension + "," + provinceName + cityName + countyName + detailInfo + "(拨打请输入分机号" + extension + ")";
//return userName + "(" + extension + ")," + virtualNumber + "-" + extension + "," + provinceName + cityName + countyName + detailInfo + "(拨打请输入分机号" + extension + ")";
return userName + "" + extension + "," + virtualNumber + "-" + extension + "," + provinceName + cityName + countyName + detailInfo + "拨打请输入分机号" + extension + "";
}
private void btnStop_Click(object sender, EventArgs e)
@@ -1121,7 +1204,7 @@ namespace TemuKJD.WXForms.OrderForms
// 查找订单
pageSize = 30;
var result = WXOrderList.orderSearch(shop, orderStatus, page, pageSize);
var result = WXOrderList.orderListSearch(shop, orderStatus, page, pageSize);
if (!result.Contains("\"code\":0"))
{
ShowShopError(shop, result);
@@ -1291,6 +1374,7 @@ namespace TemuKJD.WXForms.OrderForms
"取消优惠",
order.commonInfo.statusStr, // 订单状态
"刷新",
buyUrlNotes?.buy_url_notes, // 采购地址
"编辑",
@@ -1603,40 +1687,55 @@ namespace TemuKJD.WXForms.OrderForms
private void btnNotesOK_Click(object sender, EventArgs e)
{
var orderId = lblOrderId.Text;
var notes = txtNotes.Text.Trim();
var tagColor = lblColorTag.Text.ParseToInt();
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == lblShopId.Text);
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
if (shop != null)
var orderIds = lblOrderId.Text.Split(';');
Task.Run(() =>
{
var notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
if (notesRst.Contains("\"code\":0"))
foreach (var orderId in orderIds)
{
pnlUpdateNotes.Visible = false;
foreach (var row in rows)
{
row.Cells["colNotes"].Value = notes;
row.Cells["colNotesColor"].Value = tagColor;
row.Cells["colOpResult"].Value = "修改备注成功";
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;
row.Cells["colNotes"].Style.ForeColor = DefaultForeColor;
if (tagColor == 1)
row.Cells["colNotes"].Style.ForeColor = Color.Red;
if (tagColor == 2)
row.Cells["colNotes"].Style.ForeColor = Color.Orange;
if (tagColor == 3)
row.Cells["colNotes"].Style.ForeColor = Color.Green;
if (tagColor == 4)
row.Cells["colNotes"].Style.ForeColor = Color.Blue;
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("\"code\":0"))
{
Invoke(new Action(() =>
{
foreach (var row in rows)
{
row.Cells["colNotes"].Value = notes;
row.Cells["colNotesColor"].Value = tagColor;
row.Cells["colOpResult"].Value = "修改备注成功";
row.Cells["colNotes"].Style.ForeColor = DefaultForeColor;
if (tagColor == 1)
row.Cells["colNotes"].Style.ForeColor = Color.Red;
if (tagColor == 2)
row.Cells["colNotes"].Style.ForeColor = Color.Orange;
if (tagColor == 3)
row.Cells["colNotes"].Style.ForeColor = Color.Green;
if (tagColor == 4)
row.Cells["colNotes"].Style.ForeColor = Color.Blue;
}
pnlUpdateNotes.Visible = false;
}));
}
else
{
ShowShopError(shop, notesRst, true);
}
}
}
else
Invoke(new Action(() =>
{
pnlUpdateNotes.Visible = false;
ShowShopError(shop, notesRst, true);
}
}
}));
});
}
private void btnEditReceiveInfoCancel_Click(object sender, EventArgs e)
@@ -1779,6 +1878,7 @@ namespace TemuKJD.WXForms.OrderForms
var filterStatus = cmbFilterOrderStatus.Text.Trim();
var filterNotesNotContainWords = txtFilterNotesNotContainWords.Text.Trim().Split(new string[] { ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
var filterTitleNotContainWords = txtFilterTitleNotContainWords.Text.Trim().Split(new string[] { ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
var filterPriceNotContainWords = txtFilterPriceNotContainWords.Text.Trim().Split(new string[] { ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
string group = cmbFilterOrderShopGroup.Text.Trim().Trim(';');
if (group == "全部")
group = "";
@@ -1833,6 +1933,13 @@ namespace TemuKJD.WXForms.OrderForms
row.Visible = false;
continue;
}
string orderGoodsPrice = row.Cells["colSalePrice"].Value.ParseToString();
if (filterPriceNotContainWords.Count > 0 && filterPriceNotContainWords.Any(w => orderGoodsPrice.ParseToDecimal() == w.ParseToDecimal()))
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
continue;
}
if (chkFilterBeginTime.Checked && row.Cells["colOrderTimeFull"].Value.ParseToString().ParseToDateTime() < dtpFilterBeginTime.Value)
{
row.Cells["colCheck"].Value = false;
@@ -1858,6 +1965,7 @@ namespace TemuKJD.WXForms.OrderForms
txtFilterNotesNotContainWords.Text = "";
txtFilterTitleNotContainWords.Text = "";
txtFilterOrderShopName.Text = "";
txtFilterPriceNotContainWords.Text = "";
cmbFilterOrderShopGroup.Text = "全部";
chkFilterEndTime.Checked = false;
chkFilterBeginTime.Checked = false;
@@ -1984,13 +2092,59 @@ namespace TemuKJD.WXForms.OrderForms
txtEditReceiveInfoAddress.TextChanged += txtEditReceiveInfoAddress_TextChanged;
}
private void panelEx2_Click(object sender, EventArgs e)
private void btnStopBatchOnlineWaybill_Click(object sender, EventArgs e)
{
if (this.cancellationTokenSource != null)
this.cancellationTokenSource.Cancel();
isOnlineWayBill = false;
}
string UpdateOrderStatus(ShopLoginInfo shop, string orderId)
{
var rst = WXOrderList.orderSearch(shop, orderId);
if (!rst.Contains("\"code\":0"))
{
ShowShopError(shop, rst);
return "获取\r\n失败";
}
var statusStr = BaseRegex.GetStringJson(ref rst, "statusStr");
if (string.IsNullOrEmpty(statusStr))
statusStr = "不存在";
return statusStr;
}
private void btnBatchNotes_Click(object sender, EventArgs e)
{
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
if (rows.Count == 0)
{
BaseMsgForm.ShowError("请选择订单");
return;
}
pnlUpdateNotes.Visible = true;
pnlEditReceiveInfo.Visible = false;
pnlBuyUrl.Visible = false;
lblShopName.Text = string.Join(";", rows.Select(r => r.Cells["colSupplierName"].Value.ParseToString()).Distinct().ToList());
lblOrderId.Text = string.Join(";", rows.Select(r => r.Cells["colOrderId"].Value.ParseToString()).Distinct().ToList());
txtNotes.Text = rows[0].Cells["colNotes"].Value.ParseToString();
lblColorTag.Text = rows[0].Cells["colNotesColor"].Value.ParseToString();
ucCheckBox1.CheckBoxCheckColor = Color.Gray;
ucCheckBox1.CheckBoxBorderColor = Color.Gray;
ucCheckBox2.CheckBoxCheckColor = Color.Red;
ucCheckBox2.CheckBoxBorderColor = Color.Red;
ucCheckBox3.CheckBoxCheckColor = Color.Orange;
ucCheckBox3.CheckBoxBorderColor = Color.Orange;
ucCheckBox4.CheckBoxCheckColor = Color.Green;
ucCheckBox4.CheckBoxBorderColor = Color.Green;
ucCheckBox5.CheckBoxCheckColor = Color.Blue;
ucCheckBox5.CheckBoxBorderColor = Color.Blue;
ucCheckBox1.Checked = lblColorTag.Text == "0";
ucCheckBox2.Checked = lblColorTag.Text == "1";
ucCheckBox3.Checked = lblColorTag.Text == "2";
ucCheckBox4.Checked = lblColorTag.Text == "3";
ucCheckBox5.Checked = lblColorTag.Text == "4";
}
}
public class WXOrderList
@@ -2001,7 +2155,7 @@ namespace TemuKJD.WXForms.OrderForms
/// <param name="shop"></param>
/// <param name="orderStatus">订单状态 20待发货 30已发货</param>
/// <returns></returns>
public static string orderSearch(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)
{
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
string body = @"{""isSearch"":false,""pageSize"":" + pageSize +
@@ -2015,6 +2169,19 @@ namespace TemuKJD.WXForms.OrderForms
var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere);
return result;
}
public static string orderSearch(ShopLoginInfo shop, string orderId)
{
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
string body = @"{""isSearch"":true,""pageSize"":30,""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,
""waybillStatus"":0,""pageNum"":1,""onAftersaleOrderExist"":0,""orderStatus"":0,""orderId"":""" + orderId + @""",
""orderTime"":{""type"":0,""time"":[null,null]},""telNumber"":"""",""title"":"""",""receiverName"":"""",""finderNickName"":"""",
""merchantNotes"":"""",""merchantNotesTagColor"":0,""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,
""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",
""page"":1,""startCreateTime"":null,""endCreateTime"":null}";
string refere = "https://store.weixin.qq.com/shop/order/list";
var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere);
return result;
}
public static string addNotes(ShopLoginInfo shop, string orderId, string notes, int tagColor = 0)
{