diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index 74e76c7..3d16c5a 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -392,7 +392,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls if (buyer != null) { dicPddPickInfo[buyer] = JsonHelper.DeserializeJsonToObject(noPickupPackageData); - SetPickUpNo(dicPddPickInfo[buyer]); + await SetPickUpNo(dicPddPickInfo[buyer]); } } } @@ -541,7 +541,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls return transitOrderList; } - List GetOrderItemExtInfo(string out_order_nos) + List GetOrderItemExtInfo(string out_order_nos) { if (out_order_nos.IsNullOrEmpty()) return new List(); @@ -734,8 +734,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls } // 根据拼多多外采订单列表查询中转仓订单信息 var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos); - // 根据拼多多外采订单列表查询订单扩展信息 - var orderExtList = GetOrderItemExtInfo(out_order_nos); + // 根据拼多多外采订单列表查询中转仓额外订单信息 + var transitExtraPackageList = OrderGetOrderListHelper.GetTransitExtraPackageList(out_order_nos); + // 根据拼多多外采订单列表查询订单扩展信息 + var orderExtList = GetOrderItemExtInfo(out_order_nos); // 根据仓库订单和扩展订单获取微信订单信息 var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList(); @@ -2235,7 +2237,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls if (buyerOrder.WxSendTypeStr == "直发") { if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill) - SendAsyncWaybillOrder(buyerOrder, true); + await SendAsyncWaybillOrder(buyerOrder, true); else SendOrderE57(buyerOrder); } @@ -2670,17 +2672,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls return; } - if (order.ShopOrderIdStr == "3739357317247975936") - { - - } - - //3739354841155797760 - //3739338593856835840 - //3739343419162669824 - //3739334599561594624 - //3739334374248562688 - //3739334539482412288 var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(shop, order.ShopOrderIdStr, 100); if (!apiSearchDropship.Contains("\"errcode\":0")) throw new Exception("同步单代发查询失败!" + BaseRegex.GetStringJson(ref apiSearchDropship, "msg")); @@ -2714,7 +2705,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls html = GetHtml.PostUtf8(url, data); // 更新拍单余额 - StartUp.UpdateBalance(); + await StartUp.UpdateBalance(); } else { diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs index ad26a40..ef9ab92 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs @@ -90,6 +90,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls /// 异常重拍的原中转仓订单信息 /// public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null; + public oms_wei_external_procurement_log_info ExtraTransitWarehouseOrderInfo { get; set; } = null; private string currentUrl = ""; private volatile bool _isWindowLoaded = false; diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs index 0c5c273..11f6e28 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs @@ -94,6 +94,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls /// 异常重拍的原中转仓订单信息 /// public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null; + public oms_wei_external_procurement_log_info ExtraTransitWarehouseOrderInfo { get; set; } = null; private string currentUrl = ""; private volatile bool _isWindowLoaded = false; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs index 4913f6f..9d914b7 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs @@ -979,14 +979,17 @@ public class OrderGetOrderListHelper /// /// /// - public static async Task> GetTransitExtraPackageList(string order_ids) + public static async Task> GetTransitExtraPackageList(string order_ids, string out_order_nos = null) { 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; + if (!string.IsNullOrEmpty(order_ids)) + data3 += "&order_no=" + order_ids; + else if (!string.IsNullOrEmpty(out_order_nos)) + data3 += "&out_order_no=" + out_order_nos; var html3 = await GetHtml.PostUtf8Async(url3, data3); if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) html3 = await GetHtml.PostUtf8Async(url3, data3); diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index f41063e..381972d 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -1485,6 +1485,7 @@ Margin="0,0,0,0" HorizontalAlignment="Center" d:Visibility="Visible" + Click="btnAbnormalOrderExtraBuy_Click" Content="额外拍单" Style="{StaticResource BasePageButtonLightStyle}" Visibility="{Binding BtnAbnormalOrderExtraBuyVisibility}" /> diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index afb3884..7a0228b 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -335,7 +335,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - public static async Task BuyOrder(oms_wei_order_item_info orderItem, bool isAutoBuy = false, bool isAbnormalOrder = false) + public static async Task BuyOrder(oms_wei_order_item_info orderItem, bool isAutoBuy = false, TransitOrderBuyStatusEnum buyStatusEnum = TransitOrderBuyStatusEnum.Normal) { if (orderItem == null) { @@ -361,7 +361,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls .Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id))) { OrderListCtrl.InitOrderItemObservableProp(orderItem); - MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder); + await MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder); if (!isAutoBuy) BaseMsgWindow.ShowError("已存在中转拍单信息,请核对后再拍单"); return; @@ -380,16 +380,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId); if (orderItem == null) return; - if (isAbnormalOrder) + if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy) orderItem.BtnAbnormalOrderRebuyVisibility = oldVisibility; - if (!isAbnormalOrder && orderItem.ItemTransitOrder != null) + if (buyStatusEnum == TransitOrderBuyStatusEnum.Normal && orderItem.ItemTransitOrder != null) { // 正常单有未作废订单的,不可再拍单 BaseMsgWindow.ShowAnimateMessage("该订单已有采购记录", "Error", 6); return; } - if (isAbnormalOrder && (orderItem.ItemOrder.status <= 21 || orderItem.ItemTransitOrder == null || orderItem.ItemTransitOrder.refund_status != "买手退款成功")) + if ((buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy || buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy) && + (orderItem.ItemOrder.status <= 21 || orderItem.ItemTransitOrder == null || orderItem.ItemTransitOrder.refund_status != "买手退款成功")) { // 异常单不是被拼多多买家秒退的且已取号的,不可异常重拍 BaseMsgWindow.ShowAnimateMessage("该异常单不符合重拍条件", "Error", 6); @@ -417,7 +418,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls orderRetry: // 拍单前查询账户余额 - if (!isAbnormalOrder) + if (buyStatusEnum != TransitOrderBuyStatusEnum.AbnormalReybuy) { // 强制使用软件而非erp拍单 if (GlobalConfig.BuyConfig.IsUseAppBalance) @@ -493,7 +494,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } // Api检测是否加入代发 - //if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商 + //if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商 //{ // try // { @@ -526,15 +527,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls MainWindow.Instance.Dispatcher.Invoke(new Action(() => { if (GlobalConfig.CurrentBuyPlatform == "pdd") - PddBuyOrder(orderItem, isAbnormalOrder, isAutoBuy); - //PddBuyOrderWpf(orderItem, isAbnormalOrder, isAutoBuy); + PddBuyOrder(orderItem, buyStatusEnum, isAutoBuy); + //PddBuyOrderWpf(orderItem, buyStatusEnum, isAutoBuy); else if (GlobalConfig.CurrentBuyPlatform == "tb") - TbBuyOrderWpf(orderItem, isAbnormalOrder, isAutoBuy); + TbBuyOrderWpf(orderItem, buyStatusEnum, isAutoBuy); })); }); } - public static void TbBuyOrderWpf(oms_wei_order_item_info orderItem, bool isAbnormalOrder, bool isAutoBuy) + public static void TbBuyOrderWpf(oms_wei_order_item_info orderItem, TransitOrderBuyStatusEnum buyStatusEnum, bool isAutoBuy) { if (GlobalConfig.CurrentTaobaoBuyer == null) { @@ -554,8 +555,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls taobaoBuyView.ViewModel.InitUrl = "https://s.taobao.com/search?"; taobaoBuyView.ViewModel.IsMappingGoods = true; } - if (isAbnormalOrder) + if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy) taobaoBuyView.ViewModel.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder; + else if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy) + { + taobaoBuyView.ViewModel.ExtraTransitWarehouseOrderInfo = orderItem.ItemTransitOrder; + BaseMsgWindow.ShowError("暂不支持额外包裹单"); + return; + } new DialogWindow() { Title = "买手拍单 - 当前买手 " + GlobalConfig.CurrentTaobaoBuyer.buyer_nick, @@ -573,7 +580,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { Task.Run(async () => { - if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商 + if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商 { try { @@ -591,7 +598,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - public static void PddBuyOrderWpf(oms_wei_order_item_info orderItem, bool isAbnormalOrder, bool isAutoBuy) + public static void PddBuyOrderWpf(oms_wei_order_item_info orderItem, TransitOrderBuyStatusEnum buyStatusEnum, bool isAutoBuy) { if (GlobalConfig.CurrentPddBuyer == null) { @@ -612,8 +619,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls pddBuyView.ViewModel.InitUrl = "https://mobile.yangkeduo.com/orders.html"; //"?type=0&comment_tab=1&combine_orders=1&main_orders=1&refer_page_name=personal&refer_page_id=10001_1782219035613_a9ulipk4k3&refer_page_sn=10001"; pddBuyView.ViewModel.IsMappingGoods = true; } - if (isAbnormalOrder) + if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy) pddBuyView.ViewModel.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder; + else if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy) + { + pddBuyView.ViewModel.ExtraTransitWarehouseOrderInfo = orderItem.ItemTransitOrder; + BaseMsgWindow.ShowError("暂不支持额外包裹单"); + return; + } new DialogWindow() { Title = "买手拍单 - 当前买手 " + GlobalConfig.CurrentPddBuyer.buyer_nick, @@ -631,7 +644,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { Task.Run(async () => { - if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商 + if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商 { try { @@ -649,7 +662,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - public static void PddBuyOrder(oms_wei_order_item_info orderItem, bool isAbnormalOrder, bool isAutoBuy) + public static void PddBuyOrder(oms_wei_order_item_info orderItem, TransitOrderBuyStatusEnum buyStatusEnum, bool isAutoBuy) { PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance, orderItem, GlobalConfig.CurrentPddBuyer, orderItem.PddBuyMap); buyOrderForm.IsAutoBuy = isAutoBuy; @@ -681,8 +694,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls buyOrderForm.pnlBuy.Visible = true; buyOrderForm.pnlMap.Visible = false; } - if (isAbnormalOrder) + if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy) buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder; + else if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy) + buyOrderForm.ExtraTransitWarehouseOrderInfo = orderItem.ItemTransitOrder; buyOrderForm.ShowDialog(); OrderListCtrl.IsAutoBuy = (buyOrderForm?.IsAutoBuy).ParseToBool(); @@ -690,7 +705,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { Task.Run(async () => { - if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商 + if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商 { try { @@ -1223,12 +1238,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls transitAfterSaleWindow.ShowDialog(); } + /// 异常重拍 private async void btnAbnormalOrderRebuy_Click(object sender, RoutedEventArgs e) { if (this.DataContext is oms_wei_order_item_info orderItem) { if (orderItem.ItemOrder.status > 21 && orderItem.ItemTransitOrder != null && orderItem.ItemTransitOrder.refund_status == "买手退款成功") - await BuyOrder(orderItem, false, true); + await BuyOrder(orderItem, false, TransitOrderBuyStatusEnum.AbnormalReybuy); + } + } + + /// 异常额外拍单 + private async void btnAbnormalOrderExtraBuy_Click(object sender, RoutedEventArgs e) + { + if (this.DataContext is oms_wei_order_item_info orderItem) + { + if (orderItem.ItemOrder.status > 21 && orderItem.ItemTransitOrder != null && orderItem.ItemTransitOrder.refund_status == "买手退款成功") + await BuyOrder(orderItem, false, TransitOrderBuyStatusEnum.AbnormalExtraBuy); } } diff --git a/29WxOrderWpf/StartUp.cs b/29WxOrderWpf/StartUp.cs index 232bd66..266a9a7 100644 --- a/29WxOrderWpf/StartUp.cs +++ b/29WxOrderWpf/StartUp.cs @@ -65,9 +65,9 @@ namespace _29WxOrderWpf MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00"); // 更新下每单扣费金额 - BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order")); - BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order")); - BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order"); + //BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order")); + //BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order")); + //BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order"); BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id"); BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name"); BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner"); diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs index 8cb6d16..ff1f2a9 100644 --- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs +++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs @@ -47,8 +47,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows TransitOrder = _transitInfo?.oms_wei_external_procurement_log_info; else if (_transitInfo?.oms_wei_transfer_extra_package != null) ExtraPackage = _transitInfo?.oms_wei_transfer_extra_package; - //PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1; - PackType = (_transitInfo?.TransitPackType).ParseToInt(); + PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1; } private void mainGrid_Loaded(object sender, RoutedEventArgs e) diff --git a/AllBase/Model/Config/BuyConfig.cs b/AllBase/Model/Config/BuyConfig.cs index 702235c..9961de9 100644 --- a/AllBase/Model/Config/BuyConfig.cs +++ b/AllBase/Model/Config/BuyConfig.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -22,4 +23,17 @@ namespace AllBase.Model.Config /// public bool IsSyncDirectBuyOrderWaybill { get; set; } = false; } + + public enum TransitOrderBuyStatusEnum + { + /// 正常拍单 + [Description("正常分销发货包裹")] + Normal = 1, + /// 异常重拍,需有正常单且买手被退款导致异常且未出物流,仓库和溯源码要求与第一次一致 + [Description("异常重拍")] + AbnormalReybuy = 2, + /// 额外重拍,需有正常单且买手被退款导致异常且已出物流,仓库和溯源码无一致性要求 + [Description("额外重拍")] + AbnormalExtraBuy = 3 + } } diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index 8f11c83..f919861 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -426,10 +426,12 @@ namespace AllBase.Model.DBModel this.SetValue(x => x.ItemTransitExtraOrder, value); if (ItemTransitExtraOrder != null) { - if (ItemTransitExtraOrder.real_logistics_code.IsNullOrEmpty()) - { + if (ItemTransitExtraOrder.pack_type == "3") + ItemTransitExtraOrder.real_logistics_code = "额外重拍包裹处理中"; + else if (ItemTransitExtraOrder.pack_type == "1") + ItemTransitExtraOrder.real_logistics_code = "多品订单额外包裹处理中"; + else ItemTransitExtraOrder.real_logistics_code = "滞留补发处理中"; - } } TransitExtraPackageWaybillStr = (ItemTransitExtraOrder?.real_logistics_code + "-" + ItemTransitExtraOrder?.real_logistics_express_code).Trim('-'); TransitExtraPackageWaybillBtnStr = ItemTransitExtraOrder?.order_void_status == 1 ? "已作废" : "作废"; diff --git a/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs b/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs index 9c3f128..b70f571 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs @@ -200,8 +200,8 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) && - !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) && - !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "3" && af.order_void_status != 1)) || + !OrderItem.ItemTransitExtraOrders.Any(eo => eo.pack_type == "2" && eo.order_code == transitDetail.OrderCode && eo.order_void_status != 1) && + !OrderItem.ItemTransitExtraOrders.Any(eo => eo.pack_type == "3" && eo.order_sku_id == transitDetail.WxOrderSkuId && eo.order_void_status != 1)) || OrderItem._itemOrderIsAbnormal == true ? Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */ @@ -364,38 +364,39 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject TransitTypeStr = "额外包裹", OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId, - SourceCode = transitOrder?.random_code, + SourceCode = transitExtraOrder?.pack_type == "2" ? transitOrder?.random_code : transitExtraOrder?.random_code, WxOrderId = transitExtraOrder.order_no, - WxOrderSkuId = transitOrder?.order_sku_id, + WxOrderSkuId = transitExtraOrder?.pack_type == "2" ? transitOrder?.order_sku_id : transitExtraOrder.order_sku_id, WxOrderThumbImg = OrderItem.thumb_img, WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime, TransitAddTimeStr = transitExtraOrder.created_time == null ? "" : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), - OutOrderId = transitOrder?.out_order_no, - OutBuyerName = transitOrder?.OutOrderBuyerStr, + OutOrderId = transitExtraOrder?.pack_type == "2" ? transitOrder?.out_order_no : transitExtraOrder?.out_order_no, + OutBuyerName = transitExtraOrder?.pack_type == "2" ? transitOrder?.OutOrderBuyerStr : transitExtraOrder?.OutOrderBuyerStr, UpperWaybill = (transitExtraOrder.logistics_code + "-" + transitExtraOrder.logistics_express_code).Trim('-'), DownWaybill = (transitExtraOrder.real_logistics_code + "-" + transitExtraOrder.real_logistics_express_code).Trim('-'), - BuyRefundStatus = transitOrder.refund_status, + BuyRefundStatus = transitExtraOrder?.pack_type == "2" ? transitOrder?.refund_status : transitExtraOrder?.refund_status, CreateTime = transitExtraOrder.created_time, PickUpTime = transitExtraOrder.pickup_time, InboundTime = transitExtraOrder.inbound_time, OutboundTime = transitExtraOrder.outbound_time, - WarehouseId = transitOrder?.platform, - WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform, - + WarehouseId = transitExtraOrder?.pack_type == "2" ? transitOrder?.platform : transitExtraOrder?.platform, + ShelfCodeStr = transitExtraOrder.location_code, ShelfTimeStr = transitExtraOrder.location_write_time == null ? "" : transitExtraOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), }; + transitDetail.WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitDetail?.WarehouseId) ? TransitWarehouseData.dicWarehouseIdName[transitDetail?.WarehouseId] : transitDetail?.WarehouseId; + var buyerAccount = transitExtraOrder?.pack_type == "2" ? transitOrder?.buyer_account : transitExtraOrder?.buyer_account; if (!transitDetail.OutOrderId.StartsWith("tb_")) - transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? ""; + transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyerAccount)?.buyer_id ?? ""; else - transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? ""; + transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyerAccount)?.buyer_id ?? ""; // 额外包裹处理状态,0 未使用,1 已创建,2 创建失败 if (transitExtraOrder.transfer_warehouse_status == 0) @@ -434,7 +435,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject if (transitExtraOrder?.has_reject == 99) transitDetail.TransitRejectStatus = "拒收成功"; - // 额外包裹拦截状态暂时没有,待补充 + // 额外包裹拦截状态 var wayBillId = transitExtraOrder.logistics_express_code ?? transitExtraOrder.real_logistics_express_code; var transitAfterSaleOrder = /* 取未作废的退货包裹,如果取不到,就取第一个退货包裹 */ OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitExtraOrder.order_code && a.refund_waybill == wayBillId && a.order_void_status != 1 && a.pack_type == 2) ?? diff --git a/AllBase/Model/DBModel/oms_wei_transfer_extra_package.cs b/AllBase/Model/DBModel/oms_wei_transfer_extra_package.cs index 9a32590..4c98422 100644 --- a/AllBase/Model/DBModel/oms_wei_transfer_extra_package.cs +++ b/AllBase/Model/DBModel/oms_wei_transfer_extra_package.cs @@ -9,6 +9,12 @@ namespace AllBase.Model.DBModel; public class oms_wei_transfer_extra_package : PropertyNotifyObject { + public string OutOrderBuyerStr + { + get { return this.GetValue(x => x.OutOrderBuyerStr); } + set { this.SetValue(x => x.OutOrderBuyerStr, value); } + } + /// /// 主键ID /// @@ -24,7 +30,14 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject /// /// 买家账号 /// - public string buyer_account { get; set; } + public string buyer_account + { + get { return this.GetValue(x => x.OutOrderBuyerStr); } + set + { + this.SetValue(x => x.OutOrderBuyerStr, value); + } + } /// /// 外部金额(分) /// @@ -78,7 +91,7 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject public int? retry_acquire_success { get; set; } // '重试取号是否成功 0=未尝试/未重试 1=成功 2=失败', public int? over_weight_fee { get; set; } // '超重费用', /// - /// 中转仓额外包裹类型 1商品2额外3礼品4退货 + /// 中转仓额外包裹类型 1多件商品额外2滞留补发额外3秒退重拍额外4退货(暂未使用) /// public string pack_type { get; set; } public DateTime? rejected_time { get; set; } // '拒收时间', @@ -99,7 +112,7 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject /// /// 商品skuId /// - public string out_sku_id { get; set; } + public string order_sku_id { get; set; } /// /// 拦截退回状态:0未处理,1已退回成功,2退回失败(或其它业务码) /// diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs index 43765e3..e583a24 100644 --- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs +++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs @@ -52,7 +52,11 @@ namespace TemuKJD.ToolForms { public partial class PddMobileBuyOrderForm : BaseGeneralForm { + /// 异常重拍的主单信息 public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null; + /// 额外包裹的(含异常或非异常)的主单信息 + public oms_wei_external_procurement_log_info ExtraTransitWarehouseOrderInfo { get; set; } = null; + public pddFrontGoods3Lite pddFrontGoodsLite = new pddFrontGoods3Lite(); public bool IsClose { get; set; } = false; @@ -1454,7 +1458,7 @@ namespace TemuKJD.ToolForms // return; //} - if ((BuyType == "transit" || BuyType == "transit_extra") && string.IsNullOrEmpty(txtBuyTransitWarehouseStr)) + if ((BuyType == "transit") && string.IsNullOrEmpty(txtBuyTransitWarehouseStr)) { if (!IsAutoBuy) BaseMsgForm.ShowError("缺少中转地址,请重新绑定商品并选择仓库地址"); @@ -1463,7 +1467,7 @@ namespace TemuKJD.ToolForms return; } var transit = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransFullAddress == txtBuyTransitWarehouseStr); - if ((BuyType == "transit" || BuyType == "transit_extra") && transit == null) + if ((BuyType == "transit") && transit == null) { if (!IsAutoBuy) BaseMsgForm.ShowError("中转地址对应的中转仓不存在,请核对"); @@ -1490,10 +1494,11 @@ namespace TemuKJD.ToolForms btnManualUpdateBuyOrder.Enabled = false; + // 中转仓拍单 if (BuyType == "transit") { #region 正常中转拍单 - if (AbnormalTransitWarehouseOrderInfo == null) + if (AbnormalTransitWarehouseOrderInfo == null && ExtraTransitWarehouseOrderInfo == null) { JObject body = new JObject(); body["orderNo"] = orderItem.order_id; // 微信订单号 @@ -1665,21 +1670,15 @@ namespace TemuKJD.ToolForms } #endregion - if (!IsAutoBuy) - BaseMsgForm.ShowInfo("拍单信息保存成功"); - } - - else if (BuyType == "transit_extra") - { #region 秒退额外拍单或者多包裹订单 - if (AbnormalTransitWarehouseOrderInfo == null) + if (ExtraTransitWarehouseOrderInfo != null) { JObject body = new JObject(); body["packType"] = "3"; // 额外单类型 body["orderNo"] = orderItem.order_id; // 微信订单号 body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["batchId"] = txtBuyOrderId.Text.Trim(); // 拍单订单号-额外拍单的流水单号需手动填写 - body["orderCode"] = txtBuyOrderId.Text.Trim(); + body["orderCode"] = ExtraTransitWarehouseOrderInfo.order_code; // 中转仓主订单的流水单号 body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号 body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 body["buyerId"] = buyer.buyer_id; // 买手ID @@ -1736,7 +1735,7 @@ namespace TemuKJD.ToolForms order_void_status = 0, platform = transit.TransId, order_no = orderItem.order_id, - out_sku_id = orderItem.sku_id, + order_sku_id = orderItem.sku_id, out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt(), out_order_no = txtBuyOrderId.Text.Trim(), order_code = txtBuyOrderId.Text.Trim(), @@ -1756,6 +1755,9 @@ namespace TemuKJD.ToolForms } } #endregion + + if (!IsAutoBuy) + BaseMsgForm.ShowInfo("拍单信息保存成功"); } if (BuyType == "direct")