|
@@ -231,7 +231,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
//&& 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 && stTime >= d.ExpiredTime.Value && stTime2 <= d.ExpiredTime.Value)
|
|
|
- .Where(d=>d.Status < EOrderStatus.Filed && dateTime > d.NearlyExpiredTime && dateTime < d.ExpiredTime)
|
|
|
+ .Where(d=>d.Status < EOrderStatus.Filed && ( dateTime > d.NearlyExpiredTimeOne || dateTime > d.NearlyExpiredTime ) && dateTime < d.ExpiredTime)
|
|
|
.OrderByDescending(d => d.CreationTime);
|
|
|
}
|
|
|
|