预警工单

src/Hotline.Application/OrderApp/Handlers/OrderHandler/OrderEarlyWarningNotifyHandler.cs

@@ -38,7 +38,7 @@ namespace Hotline.Application.OrderApp.Handlers.OrderHandler
                     Sensitive = order.Sensitive,
                     OrderPushStatus = Share.Enums.Early.EOrderPushStatus.NoPush,
                 };
-                var orderEarly = await _orderEarlyWarningRepository.Queryable().Where(x => x.StartTime<= now && x.EndTime>= now && x.EarlyWarningSettingId == item.Id).FirstAsync();
+                var orderEarly = await _orderEarlyWarningRepository.Queryable().Where(x => x.StartTime<= now && x.EndTime>= now && x.AreaCode == order.AreaCode && x.EarlyWarningSettingId == item.Id).FirstAsync();
                 if (orderEarly != null)
                 {
                     model.EarlyWarningOrderId = orderEarly.Id;
@@ -54,6 +54,11 @@ namespace Hotline.Application.OrderApp.Handlers.OrderHandler
                     {
                         EarlyWarningSettingId = item.Id,
                         LastEarlyTime= now,
+                        AreaCode = order.AreaCode,
+                        Province = order.Province,
+                        County = order.County,
+                        Town = order.Town,
+                        Village = order.Village,
                     };
                     switch (item.Frequency)
                     {