即将超期

src/Hotline.Application/Orders/OrderApplication.cs

@@ -194,22 +194,23 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     /// <returns></returns>
     public ISugarQueryable<Order> GetAboutToExpireAsync(AboutToExpireListDto dto)
     {
-        //var setting = _systemSettingCacheManager.GetSetting(SettingConstants.OrderAboutToExpire);
-        //var value = setting?.SettingValue[0];
-        //value = string.IsNullOrEmpty(value) ? "0" : value;
-        //DateTime stTime = DateTime.Now.AddDays(int.Parse(value));
-        //stTime = _timeLimitDomainService.WorkDay(stTime);
-        //DateTime stTime2 = _timeLimitDomainService.WorkDay(DateTime.Now);
-
-        return _orderRepository.Queryable(canView: true).Includes(d => d.OrderDelays)
+		//var setting = _systemSettingCacheManager.GetSetting(SettingConstants.OrderAboutToExpire);
+		//var value = setting?.SettingValue[0];
+		//value = string.IsNullOrEmpty(value) ? "0" : value;
+		//DateTime stTime = DateTime.Now.AddDays(int.Parse(value));
+		//stTime = _timeLimitDomainService.WorkDay(stTime);
+		//DateTime stTime2 = _timeLimitDomainService.WorkDay(DateTime.Now);
+		DateTime? dateTime = DateTime.Now;
+		return _orderRepository.Queryable(canView: true).Includes(d => d.OrderDelays)
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No.Contains(dto.No!))
             .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title!))
             .WhereIF(dto.Delay.HasValue && dto.Delay == 1, d => d.OrderDelays.Any() == true)
             .WhereIF(dto.Delay.HasValue && dto.Delay == 2, d => d.OrderDelays.Any() == false)
                //&& stTime >= d.ExpiredTime.Value && stTime2 <= d.ExpiredTime.Value
-			.Where(d => d.ExpiredTime != null &&
-            d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited && d.ExpiredStatus == EExpiredStatus.GoingToExpired)
+			//.Where(d => d.ExpiredTime != null &&
+   //         d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited && stTime >= d.ExpiredTime.Value && stTime2 <= d.ExpiredTime.Value)
+            .Where(d=>d.Status < EOrderStatus.Filed && dateTime > d.NearlyExpiredTime && dateTime < d.ExpiredTime)
             .OrderByDescending(d => d.CreationTime);
     }
 
@@ -248,7 +249,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     /// <returns></returns>
     public ISugarQueryable<Order> GetToExpireAsync(AboutToExpireListDto dto)
     {
-        //DateTime stTime = _timeLimitDomainService.WorkDay(DateTime.Now);
+        DateTime stTime = _timeLimitDomainService.WorkDay(DateTime.Now);
 
         return _orderRepository.Queryable(canView: true).Includes(d => d.OrderDelays)
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
@@ -257,10 +258,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Title.Contains(dto.Title!))
             .WhereIF(dto.Delay.HasValue && dto.Delay == 1, d => d.OrderDelays.Any() == true)
             .WhereIF(dto.Delay.HasValue && dto.Delay == 2, d => d.OrderDelays.Any() == false)
-            //.Where(d => d.ExpiredTime != null &&
-            //(((d.Status == EOrderStatus.Filed || d.Status == EOrderStatus.Published || d.Status == EOrderStatus.Visited) && d.FiledTime >= d.ExpiredTime) ||
-            //((d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited) && stTime >= d.ExpiredTime.Value)))
-            .Where(d=>d.ExpiredStatus == EExpiredStatus.Expired)
+            .Where(d => d.ExpiredTime != null &&
+            (((d.Status == EOrderStatus.Filed || d.Status == EOrderStatus.Published || d.Status == EOrderStatus.Visited) && d.FiledTime >= d.ExpiredTime) ||
+            ((d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited) && stTime >= d.ExpiredTime.Value)))
             .OrderByDescending(x => x.CreationTime);
     }