diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index 4096e82..d5d56b3 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -931,6 +931,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls if (order.order_sn == "260923-399088033421688") { + } + if (order.ShopOrderIdStr == "3739357317247975936") + { + } if (isUpdate && !string.IsNullOrEmpty(order.ShopOrderIdStr)/* && order.WxSendTypeStr != "直发"*/) { @@ -2136,6 +2140,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls if (shop == null) throw new Exception("买手单对应店铺不存在!"); + + if (order.ShopOrderIdStr == "3739357317247975936") + { + + } + var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(shop, order.ShopOrderIdStr, 100); if (!apiSearchDropship.Contains("\"errcode\":0")) throw new Exception("同步单代发查询失败!" + BaseRegex.GetStringJson(ref apiSearchDropship, "msg")); @@ -2167,6 +2177,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls var html = GetHtml.PostUtf8(url, data); if (!html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); + + // 更新拍单余额 + StartUp.UpdateBalance(); } else { diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index ae78ae7..008ff0a 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -294,6 +294,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 读取中转仓拍单订单 var transitOrderList = GetTransitWarehouseList(order_ids); + // 额外订单包裹补发 + var transitExtraPackageList = GetTransitExtraPackageList(order_ids); + // 读取中转仓拍单订单售后状态 var transitAfterSaleList = GetTransitWarehouseAfterSaleList(order_ids); @@ -363,6 +366,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 中转仓退货包裹订单 item.ItemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code)).ToList(); item.DistribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList(); + item.ItemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList(); // 中转仓买手订单(wx_send_type等于0) item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList(); @@ -595,6 +599,33 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls return new List(); } + public static List GetTransitExtraPackageList(string order_ids) + { + if (string.IsNullOrEmpty(order_ids)) + return new List(); + + var url3 = BaseClass.Build29WxObjString("order/wx_get_transfer_extra_package"); + var data3 = UserLogin.GetSignaturex(); + data3 += "&order_no=" + order_ids; + var html3 = GetHtml.PostUtf8(url3, data3); + if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) + html3 = GetHtml.PostUtf8(url3, data3); + if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) + { + BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5); + } + List transitExtraPackageList = new List(); + try + { + transitExtraPackageList = JsonHelper.DeserializeJsonToList(JObject.Parse(html3)["data"].ParseToString()); + return transitExtraPackageList; + } + catch + { + } + return new List(); + } + public static List GetTransitWarehouseAfterSaleList(string order_ids) { if (string.IsNullOrEmpty(order_ids)) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index 1ae36f1..d96eac6 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -39,9 +39,9 @@ - + - + + + + + + +