From ae9e8ea3123de26c6c2fe2f8bf42675272055450 Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 21 Aug 2026 10:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=8B=BC=E5=A4=9A=E5=A4=9A=E4=B9=B0=E6=89=8B?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=AF=86=E5=88=AB=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 8 ++++++++ AllBase/BaseClass.cs | 2 +- AllBase/Model/DBModel/oms_wei_order_item_info.cs | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 2dd331f..089e25e 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -813,6 +813,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // }; //} + if (orderItem.order_id == "3738442174434006784") + { + + } // 260801-439070256640980260801-439070256640980 // string url = "https://mobile.yangkeduo.com/complaint.html?mode=128&after_sales_id=22059412840967&order_sn=260801-439070256640980" if (orderItem.TransitRefundStatusStr.Contains("待用户发货") && !(orderItem.ItemTransitOrderAfterSale?.downstream_waybill).IsNullOrEmpty()) @@ -885,6 +889,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { foreach (var orderItem in order.orderItems) { + if (orderItem.order_id == "3738442174434006784") + { + + } if (order.OrderBuyType == "直发" || order.OrderBuyType == "云改直") { //if (order.out_after_sale_status.ParseToString().Contains("待用户发货") && !(orderItem.DistribReturnOrderInfo?.real_logistics_express_code).IsNullOrEmpty()) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 04f33b3..ed7e065 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -36,7 +36,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 253; + public static int VersionCount = 255; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000"; diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index dbf1388..30690fa 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -238,9 +238,10 @@ namespace AllBase.Model.DBModel this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault(); this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault(); // 优先找非撤销买手退款单 - this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.statusText == "退款成功") ?? PddBuyerAfterSales?.FirstOrDefault(p => p.statusText != "申请已撤销"); + this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText == "退款成功") ?? + PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText != "申请已撤销"); if (PddBuyerAfterSale == null) - PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(); + PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no); // 直接取号和更正取号显示的买手到仓库物流 if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)