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)