From b2d91563ed775a7e96a131b3d010419b9e609709 Mon Sep 17 00:00:00 2001 From: wule Date: Wed, 9 Sep 2026 19:20:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=8B=8D=E4=B9=B0?= =?UTF-8?q?=E6=89=8B=E5=8D=95=E5=A4=9A=E6=9D=A1=E9=80=80=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrder.sln | 4 +- 29WxOrderWpf/29WxOrderWpf.csproj | 1 + .../BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs | 97 ++++++++++--------- .../OrderCtrls/OrderListRowItemCtrl.xaml | 6 +- .../Model/DBModel/oms_wei_order_item_info.cs | 12 +-- .../Model/Result/PddBuyerAfterSaleLiteInfo.cs | 8 +- 6 files changed, 70 insertions(+), 58 deletions(-) diff --git a/29WxOrder.sln b/29WxOrder.sln index cbb0fa1..56fb0f0 100644 --- a/29WxOrder.sln +++ b/29WxOrder.sln @@ -73,8 +73,8 @@ Global {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x64.ActiveCfg = Debug|Any CPU - {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x64.Build.0 = Debug|Any CPU + {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x64.ActiveCfg = Debug|x64 + {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x64.Build.0 = Debug|x64 {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x86.ActiveCfg = Debug|Any CPU {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x86.Build.0 = Debug|Any CPU {5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj index 336b87b..45a19db 100644 --- a/29WxOrderWpf/29WxOrderWpf.csproj +++ b/29WxOrderWpf/29WxOrderWpf.csproj @@ -12,6 +12,7 @@ ..\bin\ false false + AnyCPU;x64 diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index a3c3a2b..3b2186f 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -1024,7 +1024,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls if (wxOrderItem != null) { af.ShopOrderSkuNameStr = wxOrderItem.sku_attr_str; - } + af.ShopOrderOutAfterSaleStatusStr = wxOrder.out_after_sale_status; + } } } else @@ -1098,7 +1099,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls afterSale.ShopOrderIdStr = af.ShopOrderIdStr; afterSale.ShopOrderSkuIdStr = af.ShopOrderSkuIdStr; afterSale.ShopOrderSkuNameStr = af.ShopOrderSkuNameStr; - afterSale.TransitBuyerOrderRefundStatus = af.TransitBuyerOrderRefundStatus; + afterSale.ShopOrderOutAfterSaleStatusStr = af.ShopOrderOutAfterSaleStatusStr; + afterSale.TransitBuyerOrderRefundStatus = af.TransitBuyerOrderRefundStatus; afterSale.TransitWarehouseIdStr = af.TransitWarehouseIdStr; afterSale.TransitWarehouseOrderCodeStr = af.TransitWarehouseOrderCodeStr; afterSale.Express1WaybillStr = af.Express1WaybillStr; @@ -1151,58 +1153,61 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls //return; } + if (afterSale?.ShopIdStr == "3738859887048176128") + { + + } + // 记录直发或者中转仓订单买手售后情况 if (isUpdate && !string.IsNullOrEmpty(afterSale?.ShopOrderIdStr)) { - if(afterSale.WxSendTypeStr == "直发") - { - // 退款状态有变化才发起修改(退款状态不能从退款成功变成未退款) - PddBuyerAfterSaleLiteInfo afterSaleRefundSuccessExist = null; - Dispatcher.Invoke(new Action(() => - { - afterSaleRefundSuccessExist = lstPddBuyerAfterSaleInfoLite - .FirstOrDefault(a => a.orderSn == afterSale.orderSn && (a.AfterSaleStatusStr.Contains("退款成功") || a.AfterSaleStatusStr.Contains("交易已取消"))); - })); - if ((afterSaleRefundSuccessExist == null || afterSale.AfterSaleStatusStr == afterSaleRefundSuccessExist.AfterSaleStatusStr) && - afterSale.AfterSaleStatusOldStr != afterSale.AfterSaleStatusStr) - { - SendAfterSaleE57(afterSale); - afterSale.AfterSaleStatusOldStr = afterSale.AfterSaleStatusStr; - } - } - else - { - // 如果买手退款成功，仓库不是买手退款成功，则修改仓库售后字段为买手退款成功 - if (afterSale.AfterSaleStatusStr.Contains("退款成功") || afterSale.AfterSaleStatusStr.Contains("交易已取消")) - { - if (afterSale.TransitBuyerOrderRefundStatus != "买手退款成功") - { - var orderTmp = new PddBuyerOrderLiteInfo() { ShopOrderIdStr = afterSale.ShopOrderIdStr, order_sn = afterSale.orderSn }; - var refundRst = SendTransitAfterSaleE57(orderTmp, "买手退款成功"); - if (refundRst.Contains("0") || refundRst.Contains("200")) - { - afterSale.afterSaleSendStatus = "退款成功 买手退款信息更新成功"; - } - else - { - var msg = BaseRegex.GetStringXml(ref refundRst, "msg"); - afterSale.afterSaleSendStatus = "退款成功 买手退款信息更新失败，服务端返回 " + msg; - } - } - } - // 如果中转仓表买手售后状态不等于买手售后单售后，更新仓库买手售后状态 - else if (afterSale.TransitBuyerOrderRefundStatus != "买手退款成功" && afterSale.TransitBuyerOrderRefundStatus != afterSale.AfterSaleStatusStr) - { + if (afterSale.WxSendTypeStr == "直发") + { + // 退款状态有变化才发起修改(退款状态不能从退款成功变成未退款) + PddBuyerAfterSaleLiteInfo afterSaleRefundSuccessExist = null; + afterSaleRefundSuccessExist = lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.afterSalesId != afterSale.afterSalesId && + a.orderSn == afterSale.orderSn && (a.AfterSaleStatusStr.Contains("退款成功") || a.AfterSaleStatusStr.Contains("交易已取消"))); + + if ((afterSaleRefundSuccessExist == null || afterSale.AfterSaleStatusStr == afterSaleRefundSuccessExist.AfterSaleStatusStr) && + (afterSale.AfterSaleStatusOldStr != afterSale.AfterSaleStatusStr)) + { + SendAfterSaleE57(afterSale); + afterSale.AfterSaleStatusOldStr = afterSale.AfterSaleStatusStr; + } + } + else + { + // 如果买手退款成功，仓库不是买手退款成功，则修改仓库售后字段为买手退款成功 + if (afterSale.AfterSaleStatusStr.Contains("退款成功") || afterSale.AfterSaleStatusStr.Contains("交易已取消")) + { + if (afterSale.TransitBuyerOrderRefundStatus != "买手退款成功") + { + var orderTmp = new PddBuyerOrderLiteInfo() { ShopOrderIdStr = afterSale.ShopOrderIdStr, order_sn = afterSale.orderSn }; + var refundRst = SendTransitAfterSaleE57(orderTmp, "买手退款成功"); + if (refundRst.Contains("0") || refundRst.Contains("200")) + { + afterSale.afterSaleSendStatus = "退款成功 买手退款信息更新成功"; + } + else + { + var msg = BaseRegex.GetStringXml(ref refundRst, "msg"); + afterSale.afterSaleSendStatus = "退款成功 买手退款信息更新失败，服务端返回 " + msg; + } + } + } + // 如果中转仓表买手售后状态不等于买手售后单售后，更新仓库买手售后状态 + else if (afterSale.TransitBuyerOrderRefundStatus != "买手退款成功" && afterSale.TransitBuyerOrderRefundStatus != afterSale.AfterSaleStatusStr) + { if (afterSale.ShopOrderIdStr == "3738552208766960384") { } var afterSaleExistList = lstPddBuyerAfterSaleInfoLite.Where(a => a.orderSn == afterSale.orderSn).ToList(); - if ((afterSale.AfterSaleStatusStr == "退款失败" || afterSale.AfterSaleStatusStr == "申请已撤销") && + if ((afterSale.AfterSaleStatusStr == "退款失败" || afterSale.AfterSaleStatusStr == "申请已撤销") && afterSaleExistList.Any(a => a.AfterSaleStatusStr != "退款失败" && a.AfterSaleStatusStr != "申请已撤销")) - { - } + { + } else { //if (!afterSale.AfterSaleStatusStr.Contains("关闭") && !afterSale.AfterSaleStatusStr.Contains("撤销") && !afterSale.AfterSaleStatusStr.Contains("失败")) @@ -1218,8 +1223,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls afterSale.afterSaleSendStatus = "买手退款信息更新失败，服务端返回 " + msg; } } - } - } + } + } } // 买手已退款，尝试作废仓库订单 diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index 9c6e2ec..afae2a1 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -52,8 +52,8 @@ - - + + @@ -1169,7 +1169,7 @@ VerticalSpacing="5"> - +