diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs index d103d67..a592d6b 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs @@ -1124,11 +1124,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls foreach (TbBuyerAfterSaleLiteInfo af in list) { - if (af?.orderSn == "tb_5127796188031004903") - { - - } - af.buyerId = buyer.buyer_id; af.buyerName = buyer.buyer_name; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 8eb1a74..b467239 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -337,7 +337,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls /// 批量拉取订单 /// /// 按过滤条件读取读取服务端订单,已废弃 - public void GetOrder(string orderIds = "", bool filterGetCondition = false) + public async Task GetOrder(string orderIds = "", bool filterGetCondition = false) { while (!MainWindow.Instance.hasReadShop) { @@ -610,21 +610,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } if (page % 5 == 1 || page >= totalPage) - disPlayOrderTabOrderCount(); + await disPlayOrderTabOrderCount(); } // 处理店铺后台物流异常单 BottomMsg = "当前正在读取物流异常单..."; if (string.IsNullOrEmpty(orderIds)) - GetShopWaybillExceptionOrder(); + await GetShopWaybillExceptionOrder(); // 处理拒收单 BottomMsg = "当前正在处理拒收单..."; if (string.IsNullOrEmpty(orderIds)) - Task.Run(async () => - { - await AutoUpdateTransitRejectedToPddShop(); - }); + await AutoUpdateTransitRejectedToPddShop(); // 处理中转仓退货包裹 BottomMsg = "当前正在处理拦截退回总店..."; @@ -634,12 +631,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 处理退货仓分销退货 BottomMsg = "当前正在处理分销退货..."; if (string.IsNullOrEmpty(orderIds)) - Task.Run(async () => - { - await DoReturnOrderBuyerRefendSlient(); - await DoReturnOrderTransitCreateSlient(); - await AutoUpdateTransitReturnOrderToPddShop(); - }); + { + await DoReturnOrderBuyerRefendSlient(); + await DoReturnOrderTransitCreateSlient(); + await AutoUpdateTransitReturnOrderToPddShop(); + }; if (string.IsNullOrEmpty(orderIds)) hasReadOrder = true; @@ -1135,7 +1131,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList(); } - public void GetShopWaybillExceptionOrder() + public async Task GetShopWaybillExceptionOrder() { foreach (var shop in GlobalConfig.ShopLoginList) { @@ -1271,7 +1267,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } if (index % 10 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1) - disPlayOrderTabOrderCount(); + await Task.Run(() => disPlayOrderTabOrderCount()); } } diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index af232d5..bc08fb3 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -1240,24 +1240,54 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - private void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e) + private async void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e) { - if (sender == btnAddEditTransitWarehouseReject && this.DataContext is oms_wei_order_item_info orderItem1 && !string.IsNullOrWhiteSpace(orderItem1.ItemTransitOrderWithVoid?.express_1_waybill)) + if (this.DataContext is oms_wei_order_item_info orderItem) { - BaiduGetWaybillInfoView buyerLoginForm = new BaiduGetWaybillInfoView(orderItem1); - buyerLoginForm.ViewModel.InitUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + orderItem1.ItemTransitOrderWithVoid?.express_1_waybill; - - new DialogWindow() + if (sender == btnAddEditTransitWarehouseReject && !string.IsNullOrWhiteSpace(orderItem.ItemTransitOrderWithVoid?.express_1_waybill)) { - Width = 1280, - Height = 800, - Title = "物流拒收查询", - Content = buyerLoginForm, - }.Show(); - return; + ShowRejectTransitOrder(orderItem, orderItem.ItemTransitOrderWithVoid?.express_1_waybill); + } + else if (sender == btnAddEditTransitWarehouseReject_New) + { + try + { + BaseMsgWindow.ShowInfo(await RejectTransitOrder(orderItem, orderItem.ItemTransitOrder)); + } + catch (Exception ex) + { + BaseMsgWindow.ShowError(ex.Message); + } + } } + } + /// + /// 查询拒收状态 + /// + /// + /// + public static void ShowRejectTransitOrder(oms_wei_order_item_info orderItem, string upperWaybill) + { + BaiduGetWaybillInfoView buyerLoginForm = new BaiduGetWaybillInfoView(orderItem); + buyerLoginForm.ViewModel.InitUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + upperWaybill; + new DialogWindow() + { + Width = 1280, + Height = 800, + Title = "物流拒收查询", + Content = buyerLoginForm, + }.Show(); + return; + } + + /// + /// 云仓申请拒收退回总店 + /// + /// + public static async Task RejectTransitOrder(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info _itemTransitOrder) + { string msg = $@"         云仓拒收退回总店 @@ -1267,67 +1297,60 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls 收  费:免费"; if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true) - return; + return ""; - if (this.DataContext is oms_wei_order_item_info orderItem) + 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()); + OrderListCtrl.InitOrderItemObservableProp(orderItem); + + var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder.order_code && o.out_order_no == _itemTransitOrder.out_order_no); + if (itemTransitOrder == null) + itemTransitOrder = _itemTransitOrder; + + //if (itemTransitOrder?.warehouse_status == 3) { BaseMsgWindow.ShowError("商品已拒收或拦截!"); return; } + //if (itemTransitOrder?.warehouse_status == 2) { BaseMsgWindow.ShowError("商品已出库,请选择退回中转仓!"); return; } + //if (string.IsNullOrEmpty(orderItem.PddBuyerOrder?.order_sn)) { BaseMsgWindow.ShowError("商品未出单,请直接去拼多多买手申请退款"); return; } + if (itemTransitOrder?.has_reject == 1 || itemTransitOrder?.has_reject == 3) { - 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()); - OrderListCtrl.InitOrderItemObservableProp(orderItem); - - //if (orderItem.ItemTransitOrder?.warehouse_status == 3) - //{ - // BaseMsgWindow.ShowError("商品已拒收或拦截!"); - // return; - //} - //if (orderItem.ItemTransitOrder?.warehouse_status == 2) - //{ - // BaseMsgWindow.ShowError("商品已出库,请选择退回中转仓!"); - // return; - //} - //if (string.IsNullOrEmpty(orderItem.PddBuyerOrder?.order_sn)) - //{ - // BaseMsgWindow.ShowError("商品未出单,请直接去拼多多买手申请退款"); - // return; - //} - if (orderItem.ItemTransitOrder?.has_reject == 1 || orderItem.ItemTransitOrder?.has_reject == 3) - { - BaseMsgWindow.ShowAnimateMessage("已申请拒收", "Msg", 3); - return; - } - - // 中转仓拒收(已产生物流) - string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/rejectApply"; - var dataObj = new JObject(); - dataObj["orderCode"] = orderItem.ItemTransitOrder?.order_code; - dataObj["orderId"] = orderItem.order_id; - dataObj["logisticsExpressCode"] = orderItem.PddBuyerOrder?.order_sn; - var data = JsonHelper.SerializeObject(dataObj); - var html = HttpResponseWXBLL.e57PostResponse(url, data, ""); - int rejectStatus = 0; - if (html.Contains("0") || html.Contains("200")) - { - rejectStatus = 1; - BaseMsgWindow.ShowAnimateMessage("申请成功", "Msg", 3); - } - else - { - rejectStatus = 2; - var err = BaseRegex.GetStringXmlByRegs(ref html, "msg"); - BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3); - } - url = BaseClass.Build29WxObjString("order/wx_update_transit_order_reject_status"); - data = UserLogin.GetSignaturex(); - data += "&order_no=" + orderItem.order_id; - data += "&order_sku_id=" + orderItem.sku_id; - data += "&has_reject=" + rejectStatus; - html = GetHtml.PostUtf8(url, data); - - orderItem.ItemTransitOrderWithVoid.has_reject = rejectStatus; - OrderListCtrl.InitOrderItemObservableProp(orderItem); + //BaseMsgWindow.ShowAnimateMessage("已申请拒收", "Msg", 3); + return "已申请过拒收"; } + + // 中转仓拒收(已产生物流) + string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/rejectApply"; + var dataObj = new JObject(); + dataObj["orderCode"] = itemTransitOrder?.order_code; + dataObj["orderId"] = orderItem.order_id; + dataObj["logisticsExpressCode"] = orderItem.PddBuyerOrder?.order_sn; + var data = JsonHelper.SerializeObject(dataObj); + var html = HttpResponseWXBLL.e57PostResponse(url, data, ""); + int rejectStatus = 0; + if (html.Contains("0") || html.Contains("200")) + { + rejectStatus = 1; + //BaseMsgWindow.ShowAnimateMessage("申请成功", "Msg", 3); + } + else + { + rejectStatus = 2; + var err = BaseRegex.GetStringXmlByRegs(ref html, "msg"); + //BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3); + throw new Exception("申请失败" + err); + } + url = BaseClass.Build29WxObjString("order/wx_update_transit_order_reject_status"); + data = UserLogin.GetSignaturex(); + data += "&order_no=" + orderItem.order_id; + data += "&order_sku_id=" + orderItem.sku_id; + data += "&has_reject=" + rejectStatus; + html = await GetHtml.PostUtf8Async(url, data); + + itemTransitOrder.has_reject = rejectStatus; + OrderListCtrl.InitOrderItemObservableProp(orderItem); + + return "申请成功"; } + private void btnAddEditTransitWarehouseAfterSale_Click(object sender, RoutedEventArgs e) { //if (this.DataContext is oms_wei_order_item_info orderItem) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml index 6d12254..bf64e31 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml @@ -68,6 +68,7 @@ + + + + + + +