chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

读单相关信息查询全部改为异步调用

Browse Source
This commit is contained in:
wule committed 2026-11-11 14:50:05 +08:00
1 parent ee10fb5ea8
commit 761e3f102f
7 files changed
+441 -395
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+23 -23
View File
@@ -574,7 +574,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
@@ -599,7 +599,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
@@ -761,7 +761,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos);
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList)
{
if (!lstSyncLogistics.Contains(syncOrder))
@@ -781,7 +781,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids);
@@ -1124,7 +1124,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2233,13 +2233,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder)
{
btn.IsEnabled = false;
Task.Run(() =>
Task.Run(async () =>
{
var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2584,7 +2584,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public void SetPickUpNo(PddPickInfo pddPickInfo)
public async Task SetPickUpNo(PddPickInfo pddPickInfo)
{
List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in pddPickInfo.combine_list)
@@ -2600,7 +2600,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList)
{
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2681,7 +2681,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public void SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
public async Task SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
{
try
{
@@ -2692,7 +2692,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr))?.FirstOrDefault();
if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在！");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
@@ -2838,8 +2838,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}));
}
// 手动调用直发外采星系
public static string SendAfterSaleE57NeedManual(PddBuyerOrderLiteInfo order, string statusText)
// 手动调用直发外采信息
public static async Task<string> SendAfterSaleE57NeedManualAsync(PddBuyerOrderLiteInfo order, string statusText)
{
Thread.Sleep(100);
@@ -2857,21 +2857,21 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var dataStr = JsonHelper.SerializeObject(obj);
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/updateByOrderIdAfterSaleStatus";
//成功 "<ResultVo><code>0</code><msg>SUCCESS</msg><data/><totalRecords/></ResultVo>"
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
for (int i = 0; i < 3 && exportRst.Contains("操作超时"); i++)
{
Thread.Sleep(210000);
HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
}
if (exportRst.Contains("SUCCESS") || exportRst.Contains("更新外采订单的售后成功") || exportRst.Contains("<code>0</code>") || exportRst.Contains("<code>200</code>"))
if (exportRst.Contains("SUCCESS") || exportRst.Contains("更新外采订单的售后成功") || exportRst.Contains("\"code\":0") || exportRst.Contains("\"code\":200"))
{
order.OutAfterSaleStatusStr = statusText;
return exportRst;
}
else
{
BaseMsgWindow.ShowAnimateMessage("订单 " + order.ShopOrderIdStr + " 修改售后状态失败 服务端返回：" + BaseRegex.GetStringXmlByRegs(ref exportRst, exportRst, "msg"), "Error", 6);
BaseMsgWindow.ShowAnimateMessage("订单 " + order.ShopOrderIdStr + " 修改售后状态失败 服务端返回：" + BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg"), "Error", 6);
return exportRst;
}
}
@@ -3011,13 +3011,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// </summary>
/// <param name="order"></param>
/// <returns></returns>
public string PddDirectAutoAfterSale(PddBuyerOrderLiteInfo order)
public async Task<string> PddDirectAutoAfterSale(PddBuyerOrderLiteInfo order)
{
if (!order.order_status_prompt.Contains("待发货"))
{
if (order.OutAfterSaleStatusStr.IsNullOrEmpty())
{
var refundRst = SendAfterSaleE57NeedManual(order, "已发货，需手动申请售后");
var refundRst = await SendAfterSaleE57NeedManualAsync(order, "已发货，需手动申请售后");
}
return "{\"success\":false,\"msg\":\"仅未发货单可以自动退货\"}";
}
@@ -3029,14 +3029,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// 保存退款成功状态
order.order_status_prompt = "退款成功";
// 中转仓订单买手号售后信息 存到服务端
var refundRst = SendAfterSaleE57NeedManual(order, "退款成功");
if (refundRst.Contains("<code>0</code>") || refundRst.Contains("<code>200</code>"))
var refundRst = await SendAfterSaleE57NeedManualAsync(order, "退款成功");
if (refundRst.Contains("\"code\":0") || refundRst.Contains("\"code\":200"))
{
order.sendStatus = "退款成功 买手退款信息更新成功";
}
else
{
var msg = BaseRegex.GetStringXml(ref refundRst, "msg");
var msg = BaseRegex.GetStringJson(ref refundRst, "msg");
order.sendStatus = "退款成功 买手退款信息更新失败，服务端返回 " + msg;
}
lock (locker)
@@ -3047,7 +3047,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
else
{
var error_msg = BaseRegex.GetStringXmlByRegs(ref afterSaleRst, afterSaleRst, "msg", "error_msg");
var error_msg = BaseRegex.GetStringJsonByRegs(ref afterSaleRst, afterSaleRst, "msg", "error_msg");
if (string.IsNullOrEmpty(error_msg))
error_msg = afterSaleRst;
return "{\"success\":false,\"msg\":\"" + error_msg + "\"}";
29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs
+13 -13
View File
@@ -517,7 +517,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
@@ -542,7 +542,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
@@ -648,7 +648,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
pdd_afterSale.AfterSaleAddress = buyer_after_sale?.afterSaleAddress;
}
void CefReadBuyerOrder(string url, string data)
async Task CefReadBuyerOrder(string url, string data)
{
if (data.Contains("轻奢壁挂式香皂盒置物架卫生间沥水家居可拆卸收纳盒翻盖肥皂盒"))
{
@@ -694,7 +694,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos);
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList)
{
if (!lstSyncLogistics.Contains(syncOrder))
@@ -714,7 +714,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids);
@@ -892,7 +892,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}));
}
Task.Run(() =>
await Task.Run(() =>
{
// 根据订单状态 取号/修改取号
if (order.WxSendTypeStr == "直发")
@@ -1062,7 +1062,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -1810,13 +1810,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder)
{
btn.IsEnabled = false;
Task.Run(() =>
Task.Run(async () =>
{
var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2149,7 +2149,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public void SetPickUpNo(PddPickInfo pddPickInfo)
public async Task SetPickUpNo(PddPickInfo pddPickInfo)
{
List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in pddPickInfo.combine_list)
@@ -2165,7 +2165,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList)
{
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2246,7 +2246,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public void SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
public async Task SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
{
try
{
@@ -2257,7 +2257,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在！");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
+11 -11
View File
@@ -438,7 +438,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
@@ -463,7 +463,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
@@ -732,7 +732,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn));
// 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos);
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList)
{
if (!lstSyncLogistics.Contains(syncOrder))
@@ -754,7 +754,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids);
@@ -1103,7 +1103,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -1667,13 +1667,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder)
{
btn.IsEnabled = false;
Task.Run(() =>
Task.Run(async () =>
{
var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids);
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2011,7 +2011,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public void SetPickUpNo(TbPickInfo tbPickInfo)
public async Task SetPickUpNo(TbPickInfo tbPickInfo)
{
List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in tbPickInfo.combine_list)
@@ -2027,7 +2027,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList)
{
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2108,7 +2108,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public void SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false)
public async Task SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false)
{
try
{
@@ -2119,7 +2119,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在！");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+308 -332
View File
File diff suppressed because it is too large. Load diff
29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitService.cs
+3 -3
View File
@@ -277,9 +277,9 @@ internal class OrderTransitService
if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return "";
orderItem.ItemTransitOrders = OrderListCtrl.GetTransitWarehouseList(orderItem.order_id);
orderItem.PddBuyerOrders = OrderListCtrl.GetPddBuyerOrders(orderItem.order_id).Where(o => o.wx_send_type == 0).ToList();
orderItem.PddBuyerOrders.AddRange(OrderListCtrl.GetTbBuyerOrders(orderItem.order_id).Where(o => o.wx_send_type == 0).ToList());
orderItem.ItemTransitOrders = await OrderListCtrl.GetTransitWarehouseList(orderItem.order_id);
orderItem.PddBuyerOrders = (await OrderListCtrl.GetPddBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList();
orderItem.PddBuyerOrders.AddRange((await OrderListCtrl.GetTbBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList());
OrderListCtrl.InitOrderItemObservableProp(orderItem);
var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no);
29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs
+12 -12
View File
@@ -130,7 +130,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
private void btnAdd_Click(object sender, RoutedEventArgs e)
private async void btnAdd_Click(object sender, RoutedEventArgs e)
{
if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
{
@@ -199,7 +199,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
var returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
{
@@ -216,13 +216,13 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode))
{
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败，售后单获取失败");
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
@@ -239,17 +239,17 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (msg.IsNullOrEmpty())
msg = createReturnOrderRst;
BaseMsgWindow.ShowError("中转仓退货订单创建失败，服务端返回 " + msg);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
StartUp.UpdateBalance();
BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this);
this.Close();
}
public static void AddReturnOrder(oms_wei_order_item_info OrderItem)
public static async Task AddReturnOrder(oms_wei_order_item_info OrderItem)
{
// 订单不存在或已作废的，直接返回
if (OrderItem == null || OrderItem.ItemRefund == null)
@@ -325,7 +325,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
var returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
if (OrderItem.DistribReturnOrderInfo == null)
{
@@ -342,13 +342,13 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode))
{
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败，售后单获取失败", "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
@@ -364,12 +364,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (msg.IsNullOrEmpty())
msg = createReturnOrderRst;
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败，服务端返回 " + msg, "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
StartUp.UpdateBalance();
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);
Work/_29Tools/BLL/HttpResponseYkdBLL.cs
+71 -1
View File
@@ -85,7 +85,77 @@ namespace Work._29Tools.BLL
return result;
}
public static string YangkeduoGetResponse(BuyerLoginInfo buyer, string _url, string referer = "")
public static async Task<string> YangkeduoPostResponseAsync(BuyerLoginInfo buyer, string _url, string _data, string referer)
{
string cookies = "";
try
{
var cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(buyer?.cookie.ParseToString());
if (cookieLst == null)
cookieLst = new List<CefSharp.Cookie>();
foreach (var cook in cookieLst)
{
cookies += cook.Name + "=" + cook.Value + ";";
}
}
catch { }
HttpWebResponse response = null;
string result;
try
{
string url = _url;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.KeepAlive = true;
request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
request.Accept = "application/json, text/plain, */*";
request.Headers.Add("sec-ch-ua", @"""Not)A;Brand"";v=""8"", ""Chromium"";v=""138""");
request.Headers.Add("sec-ch-ua-mobile", @"?0");
request.Headers.Add("Origin", @"https://mobile.yangkeduo.com");
request.Headers.Set(HttpRequestHeader.Cookie, cookies);
//request.Headers.Add("VerifyAuthToken", @"m1PjolxzzHNRdzkNf4X0rQ4b1c734034415e092");
request.Headers.Add("Sec-Fetch-Site", @"same-origin");
request.Headers.Add("Sec-Fetch-Mode", @"cors");
request.Headers.Add("Sec-Fetch-Dest", @"empty");
request.Referer = referer;
//request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd");
request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
request.Method = "POST";
request.ServicePoint.Expect100Continue = false;
string body = _data;
byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body);
request.ContentLength = postBytes.Length;
Stream stream = request.GetRequestStream();
stream.Write(postBytes, 0, postBytes.Length);
stream.Close();
response = (HttpWebResponse)await request.GetResponseAsync();
}
catch (WebException ex)
{
if (ex.Status == WebExceptionStatus.ProtocolError)
{
response = (HttpWebResponse)ex.Response;
result = HttpResponseBLL.ReadResponse(response);
return result;
}
else return ex.Message;
}
catch (Exception e)
{
if (response != null) response.Close();
return e.Message;
}
result = HttpResponseBLL.ReadResponse(response);
return result;
}
public static string YangkeduoGetResponse(BuyerLoginInfo buyer, string _url, string referer = "")
{
string cookies = "";
try