优化中转仓处理拍单流程 隐藏部分不可用功能
This commit is contained in:
1 parent
27ac748f33
commit
518365a0d3
30 files changed
+1237
-634
No files matched your search
@@ -483,8 +483,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
pddBuyerAfterSales.AddRange(GetTbBuyerAfterSales(order_ids));
|
||||
|
||||
// 同步单
|
||||
var buyerIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
||||
var syncLogistics = GetSyncLogistics(buyerIds);
|
||||
var buyerOrderIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
||||
var syncLogistics = GetSyncLogistics(buyerOrderIds);
|
||||
|
||||
// 读取关联拍单商品
|
||||
var buyMapList = GetBuyProdMap(orderItems);
|
||||
@@ -1057,7 +1057,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id))) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id)).Distinct()) + "," +
|
||||
string.Join(",", orderItems.Select(oi => oi.product_id).Distinct());
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
@@ -1088,15 +1089,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
public static List<WXBuyMapSkusInfo> GetBuyProdMapSkus(List<oms_wei_order_item_info> orderItems)
|
||||
{
|
||||
//orderItems.RemoveAll(oi => GlobalConfig.BuyMapSkusList.Any(m => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id));
|
||||
if (orderItems == null || orderItems.Count == 0)
|
||||
var ois = orderItems?.Where(oi => !GlobalConfig.BuyMapSkusList.Any(bm => bm.spu_code == oi.out_product_id || bm.spu_code == oi.product_id)).ToList();
|
||||
if (ois == null || ois.Count == 0)
|
||||
{
|
||||
return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_buy_pord_map_skus");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id))) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
|
||||
+ "&spu_codes=" + string.Join(",", ois.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id)).Distinct()) + "," + string.Join(",", ois.Select(oi => oi.product_id).Distinct());
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultSkusMap = GetHtml.PostUtf8(url, dataMap);
|
||||
if (string.IsNullOrEmpty(resultSkusMap) || !resultSkusMap.Contains("\"code\":200"))
|
||||
@@ -2750,7 +2751,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
continue;
|
||||
}
|
||||
|
||||
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id); });
|
||||
await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id); });
|
||||
|
||||
|
||||
oms_wei_order_info order = null;
|
||||
@@ -2931,7 +2932,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
html3 = await GetHtml.PostUtf8Async(url3, data3);
|
||||
}
|
||||
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id); });
|
||||
await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id); });
|
||||
Dispatcher.Invoke(new Action(() => { BottomMsg = "正在处理买手退货,总计:" + tmpOrderItems.Count + ",已处理:" + index; }));
|
||||
#endregion
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user