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-13 19:37:46 +08:00
1 parent 8008dfb527
commit 9e10d29bfe
7 files changed
+499 -408
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+3 -3
View File
@@ -721,7 +721,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 装载同步单
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList)
{
if (!lstSyncLogistics.Contains(syncOrder))
@@ -2564,8 +2564,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0)
return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
//var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = await OrderGetOrderListHelper.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);
29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs
+3 -3
View File
@@ -648,7 +648,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 装载同步单
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList)
{
if (!lstSyncLogistics.Contains(syncOrder))
@@ -2118,8 +2118,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0)
return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
//var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = await OrderGetOrderListHelper.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);
29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
+3 -3
View File
@@ -686,7 +686,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn));
// 装载同步单
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList)
{
if (!lstSyncLogistics.Contains(syncOrder))
@@ -1980,8 +1980,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0)
return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
//var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = await OrderGetOrderListHelper.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);
29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs
+467 -7
View File
@@ -16,12 +16,54 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls;
public class OrderGetOrderListHelper
{
/// <summary>
/// 增量读取全部订单信息
/// </summary>
/// <param name="lastUpdateTime"></param>
/// <returns></returns>
public static async Task GetWxOrder‌IncrementAsync(DateTime? lastUpdateTime)
{
if (lastUpdateTime == null || lastUpdateTime == DateTime.MinValue)
return;
var shopIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
var shopIds = string.Join(",", shopIdList);
var existOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
var updateOrderList = await GetOrderInfoBase(null, 0, shopIds, lastUpdateTime);
var updateOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
var orderIdList = existOrderIdList;
orderIdList.AddRange(updateOrderIdList);
orderIdList = orderIdList.Distinct().ToList();
while(orderIdList.Count > 0 )
{
var orderIdTake = orderIdList.Take(500).ToList();
orderIdList.RemoveAll(o => orderIdTake.Contains(o));
var orderIds = string.Join(",", orderIdTake);
}
}
/// <summary>
/// 读取买手号订单对应的微信店铺订单信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
return await GetOrderInfoBase(order_ids);
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="orderIds"></param>
/// <returns></returns>
static async Task<List<oms_wei_order_info>> GetOrderInfoBase(string orderIds, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null)
static async Task<List<oms_wei_order_info>> GetOrderInfoBase(string orderIds, int pageSize = 100, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null)
{
if (string.IsNullOrEmpty(orderIds))
return new List<oms_wei_order_info>();
@@ -32,7 +74,7 @@ public class OrderGetOrderListHelper
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data = UserLogin.GetSignaturex();
data += "&erp_order_id_in=" + orderIds;
data += "&page_size=" + 100;
data += "&page_size=" + pageSize;
if (!string.IsNullOrWhiteSpace(shopIds))
data += "&erp_shop_id_in=" + shopIds;
if (beginUpdateTime != null && beginUpdateTime != DateTime.MinValue)
@@ -57,7 +99,7 @@ public class OrderGetOrderListHelper
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = await OrderListCtrl.GetOrderItemInfo(orderIds);
var orderItems = await GetOrderItemInfo(orderIds);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
@@ -73,15 +115,433 @@ public class OrderGetOrderListHelper
}
}
public static async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_order_item_info>> GetOrderItemInfo(string order_ids)
{
return await GetOrderInfoBase(order_ids, null, null);
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_item_info>();
var url = BaseClass.Build29WxObjString("order/get_erp_order_item_list");
var data = UserLogin.GetSignaturex();
data += "&erp_order_id_in=" + order_ids;
data += "&page_size=" + 2500;
var html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单详情读取失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
}
List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
try
{
orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item_info>(JObject.Parse(html)["data"].ParseToString());
if (orderItems == null)
orderItems = new List<oms_wei_order_item_info>();
}
catch (Exception ex)
{
orderItems = new List<oms_wei_order_item_info>();
BaseMsgWindow.ShowAnimateMessage("订单详情读取失败 " + ex.Message, "Error", 5);
}
return orderItems;
}
public static async Task<List<oms_wei_order_info>> GetWxOrder‌IncrementAsync()
/// <summary>
/// 读取售后单
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_refund_info>();
Thread.Sleep(100);
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
var data2 = UserLogin.GetSignaturex();
data2 += "&erp_order_id_in=" + order_ids;
var html2 = await GetHtml.PostUtf8Async(url2, data2);
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
html2 = await GetHtml.PostUtf8Async(url2, data2);
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
return refunds;
}
/// <summary>
/// 读取扩展订单信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids)
{
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
if (!string.IsNullOrEmpty(order_ids))
{
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
var data = UserLogin.GetSignaturex();
data += "&wx_order_id_in=" + order_ids;
var html = await GetHtml.PostUtf8Async(url, data);
if (!html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url, data);
if (!html.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单扩展信息查询失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
}
try
{
existOrderExtList = JsonHelper.DeserializeJsonToList<order_item_ext>(JsonHelper.JObjectParse(html)["data"].ParseToString());
}
catch
{
}
}
return existOrderExtList;
}
return new List<oms_wei_order_info>();
/// <summary>
/// 读取中转仓订单发货包裹信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_external_procurement_log_info>> GetTransitWarehouseList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_external_procurement_log_info>();
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
data3 += "&page_size=5000";
var html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
}
List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
try
{
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
return transitOrderList;
}
catch
{
}
return new List<oms_wei_external_procurement_log_info>();
}
/// <summary>
/// 读取中转仓额外包裹
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_transfer_extra_package>> GetTransitExtraPackageList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_transfer_extra_package>();
var url3 = BaseClass.Build29WxObjString("order/wx_get_transfer_extra_package");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
var html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
}
List<oms_wei_transfer_extra_package> transitExtraPackageList = new List<oms_wei_transfer_extra_package>();
try
{
transitExtraPackageList = JsonHelper.DeserializeJsonToList<oms_wei_transfer_extra_package>(JObject.Parse(html3)["data"].ParseToString());
return transitExtraPackageList;
}
catch
{
}
return new List<oms_wei_transfer_extra_package>();
}
/// <summary>
/// 读取中转仓退货包裹
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_external_procurement_after_sale_info>> GetTransitWarehouseAfterSaleList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_external_procurement_after_sale_info>();
// 读取中转仓处理售后单
var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list");
var data5 = UserLogin.GetSignaturex();
data5 += "&wx_order_id_in=" + order_ids;
var html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("云仓售后订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
}
List<oms_wei_external_procurement_after_sale_info> transitAfterSaleList = new List<oms_wei_external_procurement_after_sale_info>();
try
{
transitAfterSaleList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_after_sale_info>(JObject.Parse(html5)["data"].ParseToString())
.OrderByDescending(p => p.created_time).ToList();
if (transitAfterSaleList != null)
return transitAfterSaleList;
}
catch
{
}
return new List<oms_wei_external_procurement_after_sale_info>();
}
/// <summary>
/// 读取退货仓包裹
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<distrib_return_order_info>> GetTransitReturnOrderList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<distrib_return_order_info>();
// 读取退货仓包裹
var url5 = BaseClass.Build29WxObjString("order/wx_get_erp_return_order_list");
var data5 = UserLogin.GetSignaturex();
data5 += "&erp_order_id_in=" + order_ids;
var html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("云仓分销退货订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
}
List<distrib_return_order_info> transitAfterSaleList = new List<distrib_return_order_info>();
try
{
transitAfterSaleList = JsonHelper.DeserializeJsonToList<distrib_return_order_info>(JObject.Parse(html5)["data"].ParseToString())
.OrderByDescending(p => p.created_at).ToList();
if (transitAfterSaleList != null)
return transitAfterSaleList;
}
catch
{
}
return new List<distrib_return_order_info>();
}
/// <summary>
/// 读取多多买手单
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<order_pdd_buyer_order>> GetPddBuyerOrders(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<order_pdd_buyer_order>();
var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
var data4 = UserLogin.GetSignaturex();
data4 += "&wx_order_id_in=" + order_ids;
var html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
}
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
try
{
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
.OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerOrders;
}
catch
{
}
return new List<order_pdd_buyer_order>();
}
/// <summary>
/// 读取淘宝买手单
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<order_pdd_buyer_order>> GetTbBuyerOrders(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<order_pdd_buyer_order>();
var url4 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_order_list");
var data4 = UserLogin.GetSignaturex();
data4 += "&wx_order_id_in=" + order_ids;
var html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
}
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
try
{
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
.OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerOrders;
}
catch
{
}
return new List<order_pdd_buyer_order>();
}
/// <summary>
/// 读取多多售后
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<order_pdd_buyer_after_sale>> GetPddBuyerAfterSales(string order_ids)
{
var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
var data6 = UserLogin.GetSignaturex();
data6 += "&wx_order_id_in=" + order_ids;
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
if (!string.IsNullOrEmpty(order_ids))
{
var html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
return new List<order_pdd_buyer_after_sale>();
}
try
{
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerAfterSales;
}
catch
{
}
}
return new List<order_pdd_buyer_after_sale>();
}
/// <summary>
/// 读取淘宝售后
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<order_pdd_buyer_after_sale>> GetTbBuyerAfterSales(string order_ids)
{
var url6 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_after_sale_list");
var data6 = UserLogin.GetSignaturex();
data6 += "&wx_order_id_in=" + order_ids;
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
if (!string.IsNullOrEmpty(order_ids))
{
var html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
return new List<order_pdd_buyer_after_sale>();
}
try
{
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerAfterSales;
}
catch
{
}
}
return new List<order_pdd_buyer_after_sale>();
}
/// <summary>
/// 读取同步单信息
/// </summary>
/// <param name="buyer_order_ids"></param>
/// <param name="not_upload_pickup_status"></param>
/// <returns></returns>
public static async Task<List<yh_sync_logistics>> GetSyncLogistics(string buyer_order_ids, int? not_upload_pickup_status = null)
{
var url6 = BaseClass.Build29WxObjString("order/wx_get_sync_waybill");
var data6 = UserLogin.GetSignaturex();
data6 += "&order_id=" + buyer_order_ids;
if (not_upload_pickup_status != null)
data6 += "&not_upload_pickup_status=" + not_upload_pickup_status;
List<yh_sync_logistics> pddBuyerAfterSales = new List<yh_sync_logistics>();
if (!string.IsNullOrEmpty(buyer_order_ids))
{
var html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
return new List<yh_sync_logistics>();
}
try
{
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<yh_sync_logistics>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.id).ToList();
return pddBuyerAfterSales;
}
catch (Exception ex)
{
}
}
return new List<yh_sync_logistics>();
}
/// <summary>
/// 读取店铺物流信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_ewaybill_path>> GetEWaybillPath(string order_ids)
{
List<oms_wei_ewaybill_path> oms_wei_ewaybill_path_list = null;
if (!string.IsNullOrEmpty(order_ids))
{
try
{
var url = BaseClass.Build29WxObjString("order/wx_get_erp_ewaybill_path_latest_list");
var data = UserLogin.GetSignaturex();
data += "&erp_order_id_in=" + order_ids;
var html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("物流查询失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 6);
}
else
{
oms_wei_ewaybill_path_list = JsonHelper.DeserializeJsonToList<oms_wei_ewaybill_path>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.update_time).ToList();
return oms_wei_ewaybill_path_list;
}
}
catch
{
}
}
return new List<oms_wei_ewaybill_path>();
}
}
29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+15 -384
View File
@@ -442,17 +442,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 读取订单详情
if (string.IsNullOrEmpty(order_ids))
await Task.Delay(100);
List<oms_wei_order_item_info> orderItems = await GetOrderItemInfo(order_ids);
List<oms_wei_order_item_info> orderItems = await OrderGetOrderListHelper.GetOrderItemInfo(order_ids);
// 读取售后单
if (string.IsNullOrEmpty(order_ids))
await Task.Delay(100);
List<oms_wei_refund_info> refunds = await GetOrderRefundInfo(order_ids);
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
// 读订单扩展
if (string.IsNullOrEmpty(order_ids))
await Task.Delay(100);
List<order_item_ext> orderItemExts = await GetOrderItemExts(order_ids);
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
if (string.IsNullOrEmpty(order_ids))
{
foreach (var oie in orderItemExts)
@@ -464,30 +464,30 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
// 读取中转仓拍单订单
var transitOrderList = await GetTransitWarehouseList(order_ids);
var transitOrderList = await OrderGetOrderListHelper.GetTransitWarehouseList(order_ids);
// 额外订单包裹补发
var transitExtraPackageList = await GetTransitExtraPackageList(order_ids);
var transitExtraPackageList = await OrderGetOrderListHelper.GetTransitExtraPackageList(order_ids);
// 读取中转仓拍单订单售后状态
var transitAfterSaleList = await GetTransitWarehouseAfterSaleList(order_ids);
var transitAfterSaleList = await OrderGetOrderListHelper.GetTransitWarehouseAfterSaleList(order_ids);
// 读取分销退货（中转仓退货）订单
var transitReturnOrderList = await GetTransitReturnOrderList(order_ids);
var transitReturnOrderList = await OrderGetOrderListHelper.GetTransitReturnOrderList(order_ids);
// 读取暂时记录的买手订单，后面想办法放到中转订单库里去
var pddBuyerOrders = await GetPddBuyerOrders(order_ids);
var pddBuyerOrders = await OrderGetOrderListHelper.GetPddBuyerOrders(order_ids);
// 读取暂时记录的淘宝买手订单（格式与拼多多的一致，存在不同的表中），后面想办法放到中转订单库里去
pddBuyerOrders.AddRange(await GetTbBuyerOrders(order_ids));
pddBuyerOrders.AddRange(await OrderGetOrderListHelper.GetTbBuyerOrders(order_ids));
// 读取暂时记录的买手售后单，后面想办法放到中转订单库里去
var pddBuyerAfterSales = await GetPddBuyerAfterSales(order_ids);
var pddBuyerAfterSales = await OrderGetOrderListHelper.GetPddBuyerAfterSales(order_ids);
// 读取暂时记录的淘宝买手售后单（格式与拼多多的一致，存在不同的表中），后面想办法放到中转订单库里去
pddBuyerAfterSales.AddRange(await GetTbBuyerAfterSales(order_ids));
pddBuyerAfterSales.AddRange(await OrderGetOrderListHelper.GetTbBuyerAfterSales(order_ids));
// 同步单
var buyerOrderIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
var syncLogistics = await GetSyncLogistics(buyerOrderIds);
var syncLogistics = await OrderGetOrderListHelper.GetSyncLogistics(buyerOrderIds);
// 读取关联拍单商品
var buyMapList = await GetBuyProdMap(orderItems);
@@ -496,7 +496,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var buyMapSkusList = await GetBuyProdMapSkus(orderItems);
// 读取物流轨迹
var ewaybillLst = await GetEWaybillPath(order_ids);
var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids);
// 装载订单
foreach (JObject jObj in jArr)
@@ -669,379 +669,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_order_item_info>> GetOrderItemInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_item_info>();
var url = BaseClass.Build29WxObjString("order/get_erp_order_item_list");
var data = UserLogin.GetSignaturex();
data += "&erp_order_id_in=" + order_ids;
data += "&page_size=" + 2500;
var html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单详情读取失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
}
List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
try
{
orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item_info>(JObject.Parse(html)["data"].ParseToString());
if (orderItems == null)
orderItems = new List<oms_wei_order_item_info>();
}
catch (Exception ex)
{
orderItems = new List<oms_wei_order_item_info>();
BaseMsgWindow.ShowAnimateMessage("订单详情读取失败 " + ex.Message, "Error", 5);
}
return orderItems;
}
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids)
{
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
if (!string.IsNullOrEmpty(order_ids))
{
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
var data = UserLogin.GetSignaturex();
data += "&wx_order_id_in=" + order_ids;
var html = await GetHtml.PostUtf8Async(url, data);
if (!html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url, data);
if (!html.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单扩展信息查询失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
}
try
{
existOrderExtList = JsonHelper.DeserializeJsonToList<order_item_ext>(JsonHelper.JObjectParse(html)["data"].ParseToString());
}
catch
{
}
}
return existOrderExtList;
}
/// <summary>
/// 读取售后单
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_refund_info>();
Thread.Sleep(100);
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
var data2 = UserLogin.GetSignaturex();
data2 += "&erp_order_id_in=" + order_ids;
var html2 = await GetHtml.PostUtf8Async(url2, data2);
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
html2 = await GetHtml.PostUtf8Async(url2, data2);
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
return refunds;
}
public static async Task<List<oms_wei_external_procurement_log_info>> GetTransitWarehouseList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_external_procurement_log_info>();
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
data3 += "&page_size=5000";
var html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
}
List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
try
{
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
return transitOrderList;
}
catch
{
}
return new List<oms_wei_external_procurement_log_info>();
}
public static async Task<List<oms_wei_transfer_extra_package>> GetTransitExtraPackageList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_transfer_extra_package>();
var url3 = BaseClass.Build29WxObjString("order/wx_get_transfer_extra_package");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
var html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
}
List<oms_wei_transfer_extra_package> transitExtraPackageList = new List<oms_wei_transfer_extra_package>();
try
{
transitExtraPackageList = JsonHelper.DeserializeJsonToList<oms_wei_transfer_extra_package>(JObject.Parse(html3)["data"].ParseToString());
return transitExtraPackageList;
}
catch
{
}
return new List<oms_wei_transfer_extra_package>();
}
public static async Task<List<oms_wei_external_procurement_after_sale_info>> GetTransitWarehouseAfterSaleList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_external_procurement_after_sale_info>();
// 读取中转仓处理售后单
var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list");
var data5 = UserLogin.GetSignaturex();
data5 += "&wx_order_id_in=" + order_ids;
var html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("云仓售后订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
}
List<oms_wei_external_procurement_after_sale_info> transitAfterSaleList = new List<oms_wei_external_procurement_after_sale_info>();
try
{
transitAfterSaleList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_after_sale_info>(JObject.Parse(html5)["data"].ParseToString())
.OrderByDescending(p => p.created_time).ToList();
if (transitAfterSaleList != null)
return transitAfterSaleList;
}
catch
{
}
return new List<oms_wei_external_procurement_after_sale_info>();
}
public static async Task<List<distrib_return_order_info>> GetTransitReturnOrderList(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<distrib_return_order_info>();
// 读取中转仓处理售后单
var url5 = BaseClass.Build29WxObjString("order/wx_get_erp_return_order_list");
var data5 = UserLogin.GetSignaturex();
data5 += "&erp_order_id_in=" + order_ids;
var html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
html5 = await GetHtml.PostUtf8Async(url5, data5);
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("云仓分销退货订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
}
List<distrib_return_order_info> transitAfterSaleList = new List<distrib_return_order_info>();
try
{
transitAfterSaleList = JsonHelper.DeserializeJsonToList<distrib_return_order_info>(JObject.Parse(html5)["data"].ParseToString())
.OrderByDescending(p => p.created_at).ToList();
if (transitAfterSaleList != null)
return transitAfterSaleList;
}
catch
{
}
return new List<distrib_return_order_info>();
}
public static async Task<List<order_pdd_buyer_order>> GetPddBuyerOrders(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<order_pdd_buyer_order>();
var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
var data4 = UserLogin.GetSignaturex();
data4 += "&wx_order_id_in=" + order_ids;
var html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
}
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
try
{
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
.OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerOrders;
}
catch
{
}
return new List<order_pdd_buyer_order>();
}
public static async Task<List<order_pdd_buyer_order>> GetTbBuyerOrders(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<order_pdd_buyer_order>();
var url4 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_order_list");
var data4 = UserLogin.GetSignaturex();
data4 += "&wx_order_id_in=" + order_ids;
var html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
html4 = await GetHtml.PostUtf8Async(url4, data4);
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
}
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
try
{
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
.OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerOrders;
}
catch
{
}
return new List<order_pdd_buyer_order>();
}
public static async Task<List<order_pdd_buyer_after_sale>> GetPddBuyerAfterSales(string order_ids)
{
var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
var data6 = UserLogin.GetSignaturex();
data6 += "&wx_order_id_in=" + order_ids;
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
if (!string.IsNullOrEmpty(order_ids))
{
var html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
return new List<order_pdd_buyer_after_sale>();
}
try
{
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerAfterSales;
}
catch
{
}
}
return new List<order_pdd_buyer_after_sale>();
}
public static async Task<List<order_pdd_buyer_after_sale>> GetTbBuyerAfterSales(string order_ids)
{
var url6 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_after_sale_list");
var data6 = UserLogin.GetSignaturex();
data6 += "&wx_order_id_in=" + order_ids;
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
if (!string.IsNullOrEmpty(order_ids))
{
var html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
return new List<order_pdd_buyer_after_sale>();
}
try
{
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
return pddBuyerAfterSales;
}
catch
{
}
}
return new List<order_pdd_buyer_after_sale>();
}
public static async Task<List<yh_sync_logistics>> GetSyncLogistics(string buyer_order_ids, int? not_upload_pickup_status = null)
{
var url6 = BaseClass.Build29WxObjString("order/wx_get_sync_waybill");
var data6 = UserLogin.GetSignaturex();
data6 += "&order_id=" + buyer_order_ids;
if (not_upload_pickup_status != null)
data6 += "&not_upload_pickup_status=" + not_upload_pickup_status;
List<yh_sync_logistics> pddBuyerAfterSales = new List<yh_sync_logistics>();
if (!string.IsNullOrEmpty(buyer_order_ids))
{
var html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
html6 = await GetHtml.PostUtf8Async(url6, data6);
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
return new List<yh_sync_logistics>();
}
try
{
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<yh_sync_logistics>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.id).ToList();
return pddBuyerAfterSales;
}
catch (Exception ex)
{
}
}
return new List<yh_sync_logistics>();
}
public static async Task<List<oms_wei_ewaybill_path>> GetEWaybillPath(string order_ids)
{
List<oms_wei_ewaybill_path> oms_wei_ewaybill_path_list = null;
if (!string.IsNullOrEmpty(order_ids))
{
try
{
var url = BaseClass.Build29WxObjString("order/wx_get_erp_ewaybill_path_latest_list");
var data = UserLogin.GetSignaturex();
data += "&erp_order_id_in=" + order_ids;
var html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
BaseMsgWindow.ShowAnimateMessage("物流查询失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 6);
}
else
{
oms_wei_ewaybill_path_list = JsonHelper.DeserializeJsonToList<oms_wei_ewaybill_path>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.update_time).ToList();
return oms_wei_ewaybill_path_list;
}
}
catch
{
}
}
return new List<oms_wei_ewaybill_path>();
}
public static async Task<List<WXBuyMapInfo>> GetBuyProdMap(List<oms_wei_order_item_info> orderItems)
{
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 = 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());
orderItem.ItemTransitOrders = await OrderGetOrderListHelper.GetTransitWarehouseList(orderItem.order_id);
orderItem.PddBuyerOrders = (await OrderGetOrderListHelper.GetPddBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList();
orderItem.PddBuyerOrders.AddRange((await OrderGetOrderListHelper.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
+5 -5
View File
@@ -199,7 +199,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
{
@@ -216,7 +216,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode))
@@ -325,7 +325,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
if (OrderItem.DistribReturnOrderInfo == null)
{
@@ -342,7 +342,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode))
@@ -369,7 +369,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
StartUp.UpdateBalance();
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);