Browse Source

Merge branch 'test_feature_task363' into dev

Dun.Jason 1 month ago
parent
commit
3f8f8739b6
1 changed files with 6 additions and 5 deletions
  1. 6 5
      src/Hotline.Api/Controllers/OrderController.cs

+ 6 - 5
src/Hotline.Api/Controllers/OrderController.cs

@@ -4266,17 +4266,18 @@ public class OrderController : BaseController
     {
         var now = DateTime.Now;
         var order = await _orderRepository.GetAsync(id, HttpContext.RequestAborted);
-        if (order!.IsUrgent)
-        {
-            var orderList = await _orderRepository.Queryable()
-           .Where(x => x.CreationTime <= now && x.CreationTime >= now.AddDays(-30) && x.IsUrgent == true && SqlFunc.JsonArrayAny(x.Sensitive, order!.Sensitive)).ToListAsync();
+       
+        var orderList = await _orderRepository.Queryable()
+        .Where(x => x.CreationTime <= now && x.CreationTime >= now.AddDays(-30) && x.IsUrgent == true && SqlFunc.JsonArrayAny(x.Sensitive, order!.Sensitive)).ToListAsync();
 
+        if (orderList!=null && orderList.Count>0)
+        {
             var orderEarlyList = new List<OrderEarlyInfo>();
             foreach (var item in order!.Sensitive!)
             {
                 var model = new OrderEarlyInfo();
                 model.KeyWord = item;
-                model.WeekNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item) && x.CreationTime<= now && x.CreationTime >= now.AddDays(-7)).Count();
+                model.WeekNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item) && x.CreationTime <= now && x.CreationTime >= now.AddDays(-7)).Count();
                 model.MonthNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item)).Count();
                 orderEarlyList.Add(model);
             }