From fd6e23cfca9c507ad88642a6b97d4975c522b96c Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 31 Aug 2026 11:32:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E4=BB=93=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=A4=84=E7=90=86=E5=9C=B0=E5=9D=80=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E5=B8=A6=E5=85=B6=E4=BB=96=E6=96=87=E5=AD=97=E7=9A=84?= =?UTF-8?q?=20=20=20=E5=BA=97=E9=93=BA=E6=93=8D=E4=BD=9Ctask=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E6=97=B6=E9=97=B4=E4=BB=8E3=E4=B8=AA=E6=9C=88?= =?UTF-8?q?=E6=94=B9=E4=B8=BA10=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 4 ++-- 29WxOrderWpf/Services/TaskService.cs | 5 +++-- AllBase/Model/DBModel/oms_wei_order_info.cs | 3 ++- AllBase/Model/DBModel/oms_wei_order_item_info.cs | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index b280bd5..19cfe9f 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -1967,7 +1967,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } // 退货地址不是退货仓，跳过 - if (orderItem.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress) + if (orderItem.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == false) continue; if (orderItem.DistribReturnOrderInfo == null || orderItem.DistribReturnOrderInfo.warehouse_status == 0) @@ -2017,7 +2017,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } // 退货地址不是退货仓，跳过 - if (orderItem.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress) + if (orderItem.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == false) continue; // 退货包裹未发货，跳过（仅退货退款已发货的才自动去申请拼多多退货退款） if ((orderItem.ItemRefund?.return_waybill_id).IsNullOrEmpty()) diff --git a/29WxOrderWpf/Services/TaskService.cs b/29WxOrderWpf/Services/TaskService.cs index aaf2e3d..6355eba 100644 --- a/29WxOrderWpf/Services/TaskService.cs +++ b/29WxOrderWpf/Services/TaskService.cs @@ -22,7 +22,7 @@ namespace _29WxOrderWpf.Services; public class TaskService : SingleInstance { /// 循环查询服务器任务状态的间隔（秒） - private const int TaskStatusPollIntervalSeconds = 30; + private const int TaskStatusPollIntervalSeconds = 60; private readonly System.Timers.Timer _timer; private readonly WxOrderServiceApi _kjdApi = new WxOrderServiceApi(); @@ -56,7 +56,8 @@ public class TaskService : SingleInstance public event TaskEventHandler> TaskChanged; - public DateTime StartDate { get; private set; } = DateTime.Now.AddMonths(-3); + //public DateTime StartDate { get; private set; } = DateTime.Now.AddMonths(-3); + public DateTime StartDate { get; private set; } = DateTime.Now.AddDays(-10); public DateTime EndDate { get; private set; } = DateTime.Now.Date.AddDays(1).AddSeconds(-1); public void Start() diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs index c6d5e1e..4c69ffa 100644 --- a/AllBase/Model/DBModel/oms_wei_order_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_info.cs @@ -134,7 +134,8 @@ namespace AllBase.Model.DBModel get { //return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress); - return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress); + //return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress); + return this.orderItems.All(oi => oi.ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true); } set { } } diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index 98eed54..3cca095 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -316,7 +316,7 @@ namespace AllBase.Model.DBModel TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-'); AddEditTransitWarehouseReturnOrderStr = ""; - if (ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress) + if (ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true) { if (order_id == "3738272473468804864") {