优化礼物单问题
This commit is contained in:
1 parent
2295b0df48
commit
b8674a11c5
5 files changed
+101
-151
No files matched your search
@@ -433,52 +433,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
return transitOrderList;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取订单详情信息
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_order_info>();
|
||||
|
||||
Thread.Sleep(100);
|
||||
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
||||
var data1 = UserLogin.GetSignaturex();
|
||||
data1 += "&erp_order_id_in=" + order_ids;
|
||||
data1 += "&page_size=" + 100;
|
||||
var html1 = GetHtml.PostUtf8(url1, data1);
|
||||
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
||||
html1 = GetHtml.PostUtf8(url1, data1);
|
||||
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
||||
{
|
||||
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
//break;
|
||||
}
|
||||
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
|
||||
try
|
||||
{
|
||||
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
|
||||
if (orders == null)
|
||||
orders = new List<oms_wei_order_info>();
|
||||
|
||||
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
|
||||
foreach (var orderItem in orderItems)
|
||||
{
|
||||
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
orderItem.ItemOrder = order;
|
||||
order.orderItems.Add(orderItem);
|
||||
}
|
||||
return orders;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<oms_wei_order_info>();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static List<order_tb_buyer_after_sale> GetOrderAfterSales(string order_ids)
|
||||
{
|
||||
if (order_ids.IsNullOrEmpty())
|
||||
@@ -754,7 +708,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 = await GetOrderInfo(order_ids);
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
|
||||
//var buyerAfterSales = GetOrderAfterSales(order_ids);
|
||||
|
||||
@@ -1103,7 +1057,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 = await GetOrderInfo(order_ids);
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
@@ -1673,7 +1627,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
|
||||
|
||||
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
|
||||
var orders = await GetOrderInfo(order_ids);
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
@@ -2119,7 +2073,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
// 取最新订单状态
|
||||
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
|
||||
var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
|
||||
if (wxOrder == null)
|
||||
throw new Exception("买手单对应微信订单不存在!");
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
|
||||
|
||||
Reference in new issue
Block a user