| | | 1 | | using Microsoft.EntityFrameworkCore; |
| | | 2 | | using OzonDomains; |
| | | 3 | | using OzonDomains.Models; |
| | | 4 | | using OzonRepositories.Context; |
| | | 5 | | using System.Linq.Expressions; |
| | | 6 | | using OzonDomains.Models.OrderCarts; |
| | | 7 | | |
| | | 8 | | namespace OzonRepositories.Data |
| | | 9 | | { |
| | | 10 | | public class OrderRepository : MainRepository |
| | | 11 | | { |
| | | 12 | | private const string ZASYL_KEY = "Засыл"; |
| | | 13 | | private const string TRANSACTION_DOCUMENT_KEY = "Документ транзакции"; |
| | | 14 | | |
| | | 15 | | private readonly IOrderChangeNotifier? _changeNotifier; |
| | | 16 | | |
| | 34 | 17 | | public OrderRepository(ApplicationDbContext context, IOrderChangeNotifier? changeNotifier = null) : base(context |
| | | 18 | | { |
| | 34 | 19 | | _changeNotifier = changeNotifier; |
| | 34 | 20 | | } |
| | | 21 | | |
| | | 22 | | /// <summary> |
| | | 23 | | /// Стандартный набор Include/ThenInclude и AsSplitQuery без сортировки. |
| | | 24 | | /// Используется для IQueryable-путей, где сортировка назначается позднее |
| | | 25 | | /// (FilterByFilterDataQueryable / ApplyFinalSortQueryable). |
| | | 26 | | /// </summary> |
| | | 27 | | private static IQueryable<Order> ApplyIncludes(IQueryable<Order> query) => |
| | 13 | 28 | | query |
| | 13 | 29 | | .Include(c => c.Сurrency) |
| | 13 | 30 | | .Include(w => w.ShipmentWarehouse) |
| | 13 | 31 | | .Include(p => p.ProductInfo!) |
| | 13 | 32 | | .ThenInclude(r => r.ReplacementProduct) |
| | 13 | 33 | | .Include(a => a.AppStatus!) |
| | 13 | 34 | | .ThenInclude(s => s.StatusColor) |
| | 13 | 35 | | .Include(cs => cs.ClientStatus) |
| | 13 | 36 | | .Include(s => s.Supplier) |
| | 13 | 37 | | .Include(o => o.OzonClient) |
| | 13 | 38 | | .Include(m => m.Manufacturer) |
| | 13 | 39 | | .Include(f => f.ExcelFileData) |
| | 13 | 40 | | .Include(d => d.Delivery!) |
| | 13 | 41 | | .ThenInclude(dp => dp.Provider) |
| | 13 | 42 | | .Include(e => e.EtProducer) |
| | 13 | 43 | | .Include(o => o.OrderPrice!) |
| | 13 | 44 | | .ThenInclude(o => o.PriceIndexes) |
| | 13 | 45 | | .Include(o => o.OzonPromotionSnapshot!) |
| | 13 | 46 | | .ThenInclude(o => o.Conditions) |
| | 13 | 47 | | .AsSplitQuery(); |
| | | 48 | | |
| | | 49 | | /// <summary> |
| | | 50 | | /// Стандартный набор Include + сортировка по умолчанию (ProcessingDate desc). |
| | | 51 | | /// Для путей, где результат материализуется напрямую (GetAsync, BaseQuery, BuildOrdersQuery). |
| | | 52 | | /// </summary> |
| | | 53 | | private static IQueryable<Order> ApplyStandardIncludes(IQueryable<Order> query) => |
| | 13 | 54 | | ApplyIncludes(query) |
| | 13 | 55 | | .OrderByDescending(o => o.ProcessingDate); |
| | | 56 | | |
| | | 57 | | /// <summary> |
| | | 58 | | /// Базовый конструктор запроса для Order с набором стандартных Include. |
| | | 59 | | /// Используйте includeArchived=true чтобы включить объекты с архивом. |
| | | 60 | | /// asNoTracking=true задаёт AsNoTracking для оптимизации чтения (по умолчанию true для операций чтения). |
| | | 61 | | /// </summary> |
| | | 62 | | private IQueryable<Order> BaseQuery(bool includeArchived = false, bool asNoTracking = true) |
| | | 63 | | { |
| | 13 | 64 | | IQueryable<Order> query = _context.Orders; |
| | | 65 | | |
| | 13 | 66 | | if (!includeArchived) |
| | 13 | 67 | | query = query.Where(o => o.OrderArchive == null); |
| | | 68 | | |
| | 13 | 69 | | if (asNoTracking) |
| | 5 | 70 | | query = query.AsNoTracking(); |
| | | 71 | | |
| | 13 | 72 | | query = ApplyStandardIncludes(query) |
| | 13 | 73 | | .Include(o => o.OrderExtensions); |
| | | 74 | | |
| | 13 | 75 | | return query; |
| | | 76 | | } |
| | | 77 | | |
| | | 78 | | /// <summary> |
| | | 79 | | /// Подгружает CartItemStatus и соответствующий StatusColor для одного заказа (если имеется CartItemId). |
| | | 80 | | /// </summary> |
| | | 81 | | private async Task PopulateCartItemStatusAsync(Order order) |
| | | 82 | | { |
| | 11 | 83 | | if (order == null || !order.CartItemId.HasValue) |
| | 11 | 84 | | return; |
| | | 85 | | |
| | 0 | 86 | | var orderItem = await _context.OrderItems |
| | 0 | 87 | | .Include(o => o.ItemStatus!) |
| | 0 | 88 | | .ThenInclude(s => s.StatusColor) |
| | 0 | 89 | | .AsNoTracking() |
| | 0 | 90 | | .FirstOrDefaultAsync(oi => oi.StudioOrderId == order.Id); |
| | | 91 | | |
| | 0 | 92 | | order.CartItemStatus = orderItem?.ItemStatus; |
| | 0 | 93 | | order.CartItemStatusColor = orderItem?.ItemStatus?.StatusColor; |
| | 11 | 94 | | } |
| | | 95 | | |
| | | 96 | | /// <summary> |
| | | 97 | | /// Возвращает все активные заказы (IQueryable). Загружает ВСЕ заказы в память синхронно. |
| | | 98 | | /// </summary> |
| | | 99 | | [Obsolete("Загружает всю таблицу в память синхронно. Используйте GetQueryable() или GetOrdersWithPagination().") |
| | | 100 | | public IQueryable<Order> Get() |
| | | 101 | | { |
| | | 102 | | // Используем AsNoTracking для операций чтения |
| | | 103 | | // ВНИМАНИЕ: Синхронный ToList() - это антипаттерн для больших объемов данных |
| | 0 | 104 | | var orderList = BaseQuery(includeArchived: false, asNoTracking: true).ToList(); |
| | | 105 | | // Удаляем дубликаты по ID на случай, если они все еще появились |
| | 0 | 106 | | orderList = orderList.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | 0 | 107 | | LoadAdditionalData(orderList); |
| | 0 | 108 | | return orderList.AsQueryable(); |
| | | 109 | | } |
| | | 110 | | |
| | | 111 | | |
| | | 112 | | public List<Order> GetByProductKeyPrefixes(HashSet<string> productKeys) |
| | | 113 | | { |
| | 0 | 114 | | if (productKeys == null || productKeys.Count == 0) |
| | 0 | 115 | | return new List<Order>(); |
| | | 116 | | |
| | | 117 | | // Используем AsNoTracking для операций чтения |
| | 0 | 118 | | IQueryable<Order> baseQuery = BaseQuery(includeArchived: false, asNoTracking: true); |
| | | 119 | | |
| | | 120 | | // EF Core рекурсивно транслирует дерево Expression.OrElse — при большом числе ключей |
| | | 121 | | // это вызывает StackOverflow. Решение: разбиваем на батчи по 30 ключей и объединяем в памяти. |
| | | 122 | | const int batchSize = 30; |
| | 0 | 123 | | var keyList = productKeys.ToList(); |
| | 0 | 124 | | var allOrders = new List<Order>(); |
| | | 125 | | |
| | 0 | 126 | | for (int i = 0; i < keyList.Count; i += batchSize) |
| | | 127 | | { |
| | 0 | 128 | | var batch = keyList.Skip(i).Take(batchSize).ToHashSet(); |
| | | 129 | | |
| | 0 | 130 | | var parameter = Expression.Parameter(typeof(Order), "o"); |
| | 0 | 131 | | Expression? body = null; |
| | | 132 | | |
| | 0 | 133 | | foreach (var key in batch) |
| | | 134 | | { |
| | 0 | 135 | | var productKeyProp = Expression.Property(parameter, nameof(Order.ProductKey)); |
| | | 136 | | |
| | 0 | 137 | | var equals = Expression.Equal( |
| | 0 | 138 | | productKeyProp, |
| | 0 | 139 | | Expression.Constant(key) |
| | 0 | 140 | | ); |
| | | 141 | | |
| | 0 | 142 | | var startsWith = Expression.Call( |
| | 0 | 143 | | productKeyProp, |
| | 0 | 144 | | nameof(string.StartsWith), |
| | 0 | 145 | | Type.EmptyTypes, |
| | 0 | 146 | | Expression.Constant(key + "=") |
| | 0 | 147 | | ); |
| | | 148 | | |
| | 0 | 149 | | var condition = Expression.OrElse(equals, startsWith); |
| | | 150 | | |
| | 0 | 151 | | body = body == null |
| | 0 | 152 | | ? condition |
| | 0 | 153 | | : Expression.OrElse(body, condition); |
| | | 154 | | } |
| | | 155 | | |
| | 0 | 156 | | var predicate = Expression.Lambda<Func<Order, bool>>(body!, parameter); |
| | 0 | 157 | | allOrders.AddRange(baseQuery.Where(predicate).ToList()); |
| | | 158 | | } |
| | | 159 | | |
| | | 160 | | // Удаляем дубликаты по ID на случай, если они все еще появились |
| | 0 | 161 | | var orders = allOrders.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | 0 | 162 | | LoadAdditionalData(orders); |
| | 0 | 163 | | return orders; |
| | | 164 | | } |
| | | 165 | | |
| | | 166 | | /// <summary> |
| | | 167 | | /// Возвращает заказы (асинхронно) с опцией включения архивных. |
| | | 168 | | /// Оптимизирован для производительности - загружает OrderExtensions отдельно для избежания дубликатов. |
| | | 169 | | /// </summary> |
| | | 170 | | public async Task<IQueryable<Order>> GetAsync(bool includeArchived) |
| | | 171 | | { |
| | | 172 | | // Загружаем заказы БЕЗ OrderExtensions (избегаем дубликатов от коллекции) |
| | 0 | 173 | | var query = _context.Orders.AsNoTracking(); |
| | | 174 | | |
| | 0 | 175 | | if (!includeArchived) |
| | | 176 | | { |
| | 0 | 177 | | query = query.Where(o => o.OrderArchive == null); |
| | | 178 | | } |
| | | 179 | | |
| | 0 | 180 | | query = ApplyStandardIncludes(query); |
| | | 181 | | |
| | 0 | 182 | | if (includeArchived) |
| | 0 | 183 | | query = query.Include(o => o.OrderArchive); |
| | | 184 | | |
| | 0 | 185 | | var orderList = await query.ToListAsync(); |
| | | 186 | | |
| | | 187 | | // Инициализируем пустые коллекции OrderExtensions для всех заказов |
| | 0 | 188 | | foreach (var order in orderList) |
| | | 189 | | { |
| | 0 | 190 | | order.OrderExtensions = new List<OrderExtension>(); |
| | | 191 | | } |
| | | 192 | | |
| | | 193 | | // OrderItems НЕ загружаются здесь, чтобы оптимизировать кэш |
| | | 194 | | // Они будут загружены позже только для заказов, которые попадут на страницу |
| | 0 | 195 | | return orderList.AsQueryable(); |
| | 0 | 196 | | } |
| | | 197 | | |
| | | 198 | | /// <summary> |
| | | 199 | | /// Возвращает IQueryable заказов БЕЗ загрузки данных в память и БЕЗ сортировки. |
| | | 200 | | /// Используется для применения фильтров на уровне БД. |
| | | 201 | | /// Сортировка назначается позже — FilterByFilterDataQueryable / ApplyFinalSortQueryable. |
| | | 202 | | /// ВАЖНО: Использует AsSplitQuery() для избежания дублирования заказов при Include коллекций. |
| | | 203 | | /// </summary> |
| | | 204 | | public IQueryable<Order> GetQueryable(bool includeArchived) |
| | | 205 | | { |
| | 0 | 206 | | var query = _context.Orders.AsNoTracking(); |
| | | 207 | | |
| | 0 | 208 | | if (!includeArchived) |
| | | 209 | | { |
| | 0 | 210 | | query = query.Where(o => o.OrderArchive == null); |
| | | 211 | | } |
| | | 212 | | |
| | 0 | 213 | | query = ApplyIncludes(query); |
| | | 214 | | |
| | 0 | 215 | | if (includeArchived) |
| | 0 | 216 | | query = query.Include(o => o.OrderArchive); |
| | | 217 | | |
| | 0 | 218 | | return query; |
| | | 219 | | } |
| | | 220 | | |
| | | 221 | | /// <summary> |
| | | 222 | | /// Получить заказ по id (асинхронно) с заполнением CartItemStatus при необходимости. |
| | | 223 | | /// Использует трекинг для возможности обновления. |
| | | 224 | | /// </summary> |
| | | 225 | | /// <param name="id">Id заказа</param> |
| | | 226 | | public async Task<Order?> GetAsync(int id) |
| | | 227 | | { |
| | | 228 | | // Для операций чтения используем AsNoTracking, но если нужен трекинг для обновления - передаем false |
| | 8 | 229 | | var order = await BaseQuery(includeArchived: false, asNoTracking: false) |
| | 8 | 230 | | .FirstOrDefaultAsync(o => o.Id == id); |
| | 8 | 231 | | if (order == null) return null; |
| | 8 | 232 | | await PopulateCartItemStatusAsync(order); |
| | 8 | 233 | | return order; |
| | 8 | 234 | | } |
| | | 235 | | |
| | | 236 | | /// <summary> |
| | | 237 | | /// Получить заказ по id без трекинга (асинхронно). |
| | | 238 | | /// </summary> |
| | | 239 | | public async Task<Order?> GetAsyncNoTracking(int id) |
| | | 240 | | { |
| | 4 | 241 | | var order = await BaseQuery(includeArchived: false, asNoTracking: true) |
| | 4 | 242 | | .FirstOrDefaultAsync(o => o.Id == id); |
| | 5 | 243 | | if (order == null) return null; |
| | 3 | 244 | | await PopulateCartItemStatusAsync(order); |
| | 3 | 245 | | return order; |
| | 4 | 246 | | } |
| | | 247 | | |
| | | 248 | | /// <summary> |
| | | 249 | | /// Получить заказы по списку id без трекинга (асинхронно). |
| | | 250 | | /// Используется для GET методов транзакций - изменения в этих заказах НЕ сохранятся в БД. |
| | | 251 | | /// ids приводятся к уникальным — дубликаты не возвращаются (один заказ — одна строка). |
| | | 252 | | /// CartItemStatus и цвета статусов подгружаются одним пакетным запросом. |
| | | 253 | | /// Дедупликация по Id — вложенные коллекции (OrderExtensions, ExtraExpenses и т.д.) |
| | | 254 | | /// при Include/AsSplitQuery могут приводить к повторению одной и той же сущности Order. |
| | | 255 | | /// </summary> |
| | | 256 | | public async Task<List<Order>> GetOrdersNoTracking(int[] ids) |
| | | 257 | | { |
| | 1 | 258 | | if (ids == null || ids.Length == 0) |
| | 0 | 259 | | return new List<Order>(); |
| | | 260 | | |
| | 1 | 261 | | var distinctIds = ids.Distinct().ToArray(); |
| | | 262 | | |
| | 1 | 263 | | var ordersRaw = await BaseQuery(includeArchived: false, asNoTracking: true) |
| | 1 | 264 | | .Where(o => distinctIds.Contains(o.Id)) |
| | 1 | 265 | | .ToListAsync(); |
| | | 266 | | |
| | | 267 | | // Один заказ — одна запись: вложенные модели с теми же заказами дают дубликаты при Include |
| | 3 | 268 | | var orders = ordersRaw.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | | 269 | | |
| | | 270 | | // Один пакетный запрос вместо N вызовов PopulateCartItemStatusAsync |
| | 1 | 271 | | await LoadOrderItemsForOrders(orders); |
| | | 272 | | |
| | 1 | 273 | | return orders; |
| | 1 | 274 | | } |
| | | 275 | | |
| | | 276 | | public async Task<List<int>> GetOrderIdsByNumbersAndArticles(List<(string OrderNumber, string Article)> orders) |
| | | 277 | | { |
| | 0 | 278 | | if (orders == null || orders.Count == 0) |
| | 0 | 279 | | return new List<int>(); |
| | | 280 | | |
| | 0 | 281 | | var normalizedPairs = orders |
| | 0 | 282 | | .Where(o => !string.IsNullOrWhiteSpace(o.OrderNumber) && !string.IsNullOrWhiteSpace(o.Article)) |
| | 0 | 283 | | .Select(o => ( |
| | 0 | 284 | | OrderNumber: NormalizeShipmentNumberForMatching(o.OrderNumber), |
| | 0 | 285 | | Article: o.Article.Trim())) |
| | 0 | 286 | | .Where(o => !string.IsNullOrWhiteSpace(o.OrderNumber) && !string.IsNullOrWhiteSpace(o.Article)) |
| | 0 | 287 | | .Distinct() |
| | 0 | 288 | | .ToHashSet(); |
| | | 289 | | |
| | 0 | 290 | | if (normalizedPairs.Count == 0) |
| | 0 | 291 | | return new List<int>(); |
| | | 292 | | |
| | 0 | 293 | | var articles = normalizedPairs.Select(o => o.Article).Distinct().ToList(); |
| | | 294 | | |
| | | 295 | | // Сначала фильтруем по ProductKey в БД, остальное на клиенте |
| | 0 | 296 | | var query = await _context.Orders |
| | 0 | 297 | | .AsNoTracking() |
| | 0 | 298 | | .Where(o => o.OrderArchive == null) |
| | 0 | 299 | | .Where(o => o.ProductKey != null && articles.Contains(o.ProductKey)) |
| | 0 | 300 | | .Select(o => new { o.Id, o.ProductKey, o.ShipmentNumber }) |
| | 0 | 301 | | .ToListAsync(); |
| | | 302 | | |
| | 0 | 303 | | var matching = query |
| | 0 | 304 | | .Where(o => !string.IsNullOrWhiteSpace(o.ShipmentNumber) && |
| | 0 | 305 | | normalizedPairs.Contains((NormalizeShipmentNumberForMatching(o.ShipmentNumber), o.ProductKey |
| | 0 | 306 | | .Select(o => o.Id) |
| | 0 | 307 | | .Distinct() |
| | 0 | 308 | | .ToList(); |
| | | 309 | | |
| | 0 | 310 | | return matching; |
| | 0 | 311 | | } |
| | | 312 | | |
| | | 313 | | public async Task<HashSet<(string OrderNumber, string Article)>> GetMatchedNumbersAndArticles(List<(string Order |
| | | 314 | | { |
| | 0 | 315 | | if (orders == null || orders.Count == 0) |
| | 0 | 316 | | return new HashSet<(string OrderNumber, string Article)>(); |
| | | 317 | | |
| | 0 | 318 | | var normalizedPairs = orders |
| | 0 | 319 | | .Where(o => !string.IsNullOrWhiteSpace(o.OrderNumber) && !string.IsNullOrWhiteSpace(o.Article)) |
| | 0 | 320 | | .Select(o => ( |
| | 0 | 321 | | OrderNumber: NormalizeShipmentNumberForMatching(o.OrderNumber), |
| | 0 | 322 | | Article: o.Article.Trim())) |
| | 0 | 323 | | .Where(o => !string.IsNullOrWhiteSpace(o.OrderNumber) && !string.IsNullOrWhiteSpace(o.Article)) |
| | 0 | 324 | | .Distinct() |
| | 0 | 325 | | .ToHashSet(); |
| | | 326 | | |
| | 0 | 327 | | if (normalizedPairs.Count == 0) |
| | 0 | 328 | | return new HashSet<(string OrderNumber, string Article)>(); |
| | | 329 | | |
| | 0 | 330 | | var articles = normalizedPairs.Select(o => o.Article).Distinct().ToList(); |
| | | 331 | | |
| | 0 | 332 | | var query = await _context.Orders |
| | 0 | 333 | | .AsNoTracking() |
| | 0 | 334 | | .Where(o => o.OrderArchive == null) |
| | 0 | 335 | | .Where(o => o.ProductKey != null && articles.Contains(o.ProductKey)) |
| | 0 | 336 | | .Select(o => new { o.ProductKey, o.ShipmentNumber }) |
| | 0 | 337 | | .ToListAsync(); |
| | | 338 | | |
| | 0 | 339 | | return query |
| | 0 | 340 | | .Where(o => !string.IsNullOrWhiteSpace(o.ShipmentNumber) && !string.IsNullOrWhiteSpace(o.ProductKey)) |
| | 0 | 341 | | .Select(o => (OrderNumber: NormalizeShipmentNumberForMatching(o.ShipmentNumber), Article: o.ProductKey!) |
| | 0 | 342 | | .Where(normalizedPairs.Contains) |
| | 0 | 343 | | .ToHashSet(); |
| | 0 | 344 | | } |
| | | 345 | | |
| | | 346 | | private static string NormalizeShipmentNumberForMatching(string? shipmentNumber) |
| | | 347 | | { |
| | 0 | 348 | | return ShipmentNumberMatching.Normalize(shipmentNumber); |
| | | 349 | | } |
| | | 350 | | |
| | | 351 | | public async Task<Order?> GetAsyncForCart(int id) |
| | | 352 | | { |
| | | 353 | | // Используем AsNoTracking для операций чтения |
| | 0 | 354 | | return await _context.Orders |
| | 0 | 355 | | .AsNoTracking() |
| | 0 | 356 | | .Where(o => o.OrderArchive == null) |
| | 0 | 357 | | .Include(p => p.ProductInfo) |
| | 0 | 358 | | .Include(a => a.AppStatus!) |
| | 0 | 359 | | .ThenInclude(s => s.StatusColor) |
| | 0 | 360 | | .Include(cs => cs.ClientStatus) |
| | 0 | 361 | | .Include(s => s.Supplier) |
| | 0 | 362 | | .Include(o => o.OzonClient) |
| | 0 | 363 | | .Include(m => m.Manufacturer) |
| | 0 | 364 | | .Include(d => d.Delivery!) |
| | 0 | 365 | | .ThenInclude(dp => dp.Provider) |
| | 0 | 366 | | .Include(e => e.EtProducer) |
| | 0 | 367 | | .Include(o => o.OrderPrice!) |
| | 0 | 368 | | .ThenInclude(o => o.PriceIndexes) |
| | 0 | 369 | | .Include(o => o.OrderExtensions) |
| | 0 | 370 | | .FirstOrDefaultAsync(o => o.Id == id); |
| | 0 | 371 | | } |
| | | 372 | | |
| | | 373 | | /// <summary> |
| | | 374 | | /// Получить заказ по объекту (по Key). |
| | | 375 | | /// Использует трекинг для возможности обновления. |
| | | 376 | | /// </summary> |
| | | 377 | | public async Task<Order?> GetAsync(Order value) |
| | | 378 | | { |
| | | 379 | | // Для операций чтения используем AsNoTracking, но если нужен трекинг для обновления - передаем false |
| | 0 | 380 | | var order = await BaseQuery(includeArchived: false, asNoTracking: false) |
| | 0 | 381 | | .FirstOrDefaultAsync(o => o.Key == value.Key); |
| | 0 | 382 | | if (order == null) return null; |
| | 0 | 383 | | await PopulateCartItemStatusAsync(order); |
| | 0 | 384 | | return order; |
| | 0 | 385 | | } |
| | | 386 | | |
| | | 387 | | /// <summary> |
| | | 388 | | /// Возвращает заказы производителя по коду (IQueryable для дальнейшего фильтра/пейджинга). |
| | | 389 | | /// </summary> |
| | | 390 | | public IQueryable<Order> GetOrdersByManufacturerCode(string code) |
| | | 391 | | { |
| | 0 | 392 | | return _context.Orders.Include(m => m.Manufacturer) |
| | 0 | 393 | | .Where(o => o.Manufacturer != null && o.Manufacturer.Code == code); |
| | | 394 | | } |
| | | 395 | | |
| | | 396 | | public async Task<int> Update(Order value) |
| | | 397 | | { |
| | | 398 | | // Заказ, уже трекаемый контекстом (например, загруженный через GetAsync с Include |
| | | 399 | | // навигаций), нельзя пропускать через ClearOrderNavigationsForUpdate: обнуление |
| | | 400 | | // reference-навигации на уже установленной EF-связи заставляет DetectChanges сбросить |
| | | 401 | | // FK-колонку в NULL при SaveChanges, ДАЖЕ если сам FK-скаляр восстановлен обратно — |
| | | 402 | | // EF в этом случае доверяет разрыву навигации больше, чем значению скаляра. |
| | | 403 | | // Обнуление навигаций нужно только для по-настоящему detached объектов |
| | | 404 | | // (после model binding из формы, с "мусорными" вложенными объектами вроде Name=null). |
| | 1 | 405 | | if (_context.Entry(value).State == EntityState.Detached) |
| | | 406 | | { |
| | 0 | 407 | | ClearOrderNavigationsForUpdate(value); |
| | 0 | 408 | | _context.Orders.Update(value); |
| | | 409 | | } |
| | | 410 | | |
| | 1 | 411 | | var result = await _context.SaveChangesAsync(); |
| | 1 | 412 | | _changeNotifier?.NotifyOrderChanged(value.Id); |
| | 1 | 413 | | return result; |
| | 1 | 414 | | } |
| | | 415 | | |
| | | 416 | | public async Task<int> UpdateRange(List<Order> orders) |
| | | 417 | | { |
| | 4 | 418 | | if (orders == null || !orders.Any()) |
| | 0 | 419 | | return 0; |
| | | 420 | | |
| | 16 | 421 | | foreach (var order in orders) |
| | | 422 | | { |
| | | 423 | | // См. комментарий в Update(Order) — не трогаем навигации уже трекаемых заказов. |
| | 4 | 424 | | if (_context.Entry(order).State == EntityState.Detached) |
| | | 425 | | { |
| | 1 | 426 | | ClearOrderNavigationsForUpdate(order); |
| | 1 | 427 | | _context.Orders.Update(order); |
| | | 428 | | } |
| | | 429 | | } |
| | | 430 | | |
| | 4 | 431 | | var result = await _context.SaveChangesAsync(); |
| | 4 | 432 | | _changeNotifier?.NotifyOrdersChanged(orders.Select(o => o.Id)); |
| | 4 | 433 | | return result; |
| | 4 | 434 | | } |
| | | 435 | | |
| | | 436 | | /// <summary> |
| | | 437 | | /// Отвязывает навигации перед Update/UpdateRange, чтобы EF не пытался сохранить |
| | | 438 | | /// связанные сущности из model binding (часто с null Name). |
| | | 439 | | /// Вызывается только для detached-заказов (см. Update/UpdateRange) — на них обнуление |
| | | 440 | | /// навигации безопасно, т.к. EF ещё не устанавливал связь и просто использует то, |
| | | 441 | | /// что окажется в объекте на момент Attach/Update. FK-скаляры на всякий случай |
| | | 442 | | /// сохраняются и восстанавливаются вокруг обнуления. |
| | | 443 | | /// </summary> |
| | | 444 | | private static void ClearOrderNavigationsForUpdate(Order order) |
| | | 445 | | { |
| | 1 | 446 | | var appStatusId = order.AppStatusId; |
| | 1 | 447 | | var clientStatusId = order.ClientStatusId; |
| | 1 | 448 | | var supplierId = order.SupplierId; |
| | 1 | 449 | | var shipmentWarehouseId = order.ShipmentWarehouseId; |
| | 1 | 450 | | var etProducerId = order.EtProducerId; |
| | 1 | 451 | | var manufacturerId = order.ManufacturerId; |
| | 1 | 452 | | var ozonClientId = order.OzonClientId; |
| | 1 | 453 | | var deliveryId = order.DeliveryId; |
| | 1 | 454 | | var currencyId = order.СurrencyId; |
| | 1 | 455 | | var productInfoId = order.ProductInfoId; |
| | 1 | 456 | | var excelFileDataId = order.ExcelFileDataId; |
| | | 457 | | |
| | 1 | 458 | | order.AppStatus = null; |
| | 1 | 459 | | order.ClientStatus = null; |
| | 1 | 460 | | order.Supplier = null; |
| | 1 | 461 | | order.ShipmentWarehouse = null; |
| | 1 | 462 | | order.EtProducer = null; |
| | 1 | 463 | | order.Manufacturer = null; |
| | 1 | 464 | | order.OzonClient = null; |
| | 1 | 465 | | order.Delivery = null; |
| | 1 | 466 | | order.Сurrency = null; |
| | 1 | 467 | | order.ProductInfo = null; |
| | 1 | 468 | | order.ExcelFileData = null; |
| | 1 | 469 | | order.OrderArchive = null; |
| | 1 | 470 | | order.OrderPrice = null; |
| | 1 | 471 | | order.ExtraExpenses = []; |
| | 1 | 472 | | order.OrderExtensions = []; |
| | | 473 | | |
| | 1 | 474 | | order.AppStatusId = appStatusId; |
| | 1 | 475 | | order.ClientStatusId = clientStatusId; |
| | 1 | 476 | | order.SupplierId = supplierId; |
| | 1 | 477 | | order.ShipmentWarehouseId = shipmentWarehouseId; |
| | 1 | 478 | | order.EtProducerId = etProducerId; |
| | 1 | 479 | | order.ManufacturerId = manufacturerId; |
| | 1 | 480 | | order.OzonClientId = ozonClientId; |
| | 1 | 481 | | order.DeliveryId = deliveryId; |
| | 1 | 482 | | order.СurrencyId = currencyId; |
| | 1 | 483 | | order.ProductInfoId = productInfoId; |
| | 1 | 484 | | order.ExcelFileDataId = excelFileDataId; |
| | 1 | 485 | | } |
| | | 486 | | |
| | | 487 | | /// <summary>Установить флаг IsReturned для заказа.</summary> |
| | | 488 | | public async Task<int> SetIsReturnedAsync(int orderId, bool isReturned) |
| | | 489 | | { |
| | 0 | 490 | | return await _context.Orders |
| | 0 | 491 | | .Where(o => o.Id == orderId) |
| | 0 | 492 | | .ExecuteUpdateAsync(s => s.SetProperty(o => o.IsReturned, isReturned)); |
| | 0 | 493 | | } |
| | | 494 | | |
| | | 495 | | /// <summary>Батч-установка флага IsReturned для списка заказов. Один ExecuteUpdate вместо N вызовов.</summary> |
| | | 496 | | public async Task<int> SetIsReturnedForOrderIdsAsync(IEnumerable<int> orderIds, bool isReturned) |
| | | 497 | | { |
| | 0 | 498 | | var idList = orderIds?.Distinct().ToList() ?? new List<int>(); |
| | 0 | 499 | | if (idList.Count == 0) |
| | 0 | 500 | | return 0; |
| | | 501 | | |
| | 0 | 502 | | return await _context.Orders |
| | 0 | 503 | | .Where(o => idList.Contains(o.Id)) |
| | 0 | 504 | | .ExecuteUpdateAsync(s => s.SetProperty(o => o.IsReturned, isReturned)); |
| | 0 | 505 | | } |
| | | 506 | | |
| | | 507 | | /// <summary> |
| | | 508 | | /// Привести IsReturned в соответствие с его смыслом — «есть запись в OrderReturns». |
| | | 509 | | /// |
| | | 510 | | /// Флаг выставлял только импорт возвратов и только для заказов, затронутых текущим прогоном, |
| | | 511 | | /// а снимать его было некому. Расходится он в обе стороны: заказ остаётся помеченным, когда |
| | | 512 | | /// Ozon исправил номер отправления и возврат переехал на другой заказ; и наоборот, заказ с |
| | | 513 | | /// возвратами остаётся без флага, если его импортировали в обход прогона — а тогда возврат |
| | | 514 | | /// не показывается в списке заказов, потому что OrderReturnInfoService смотрит на этот флаг. |
| | | 515 | | /// </summary> |
| | | 516 | | /// <returns>(Сколько флагов снято, сколько выставлено).</returns> |
| | | 517 | | /// <remarks> |
| | | 518 | | /// Выборка Id написана на SQL (MySQL/MariaDB), а не через LINQ с Any(): вариант на LINQ |
| | | 519 | | /// разворачивался в коррелированный EXISTS с ведущей таблицей Orders — почти сто тысяч строк |
| | | 520 | | /// ради полутора десятков обновлений. Здесь обратное направление ведёт OrderReturns, которая |
| | | 521 | | /// на два порядка меньше, а прямое обходится одним LEFT JOIN вместо подзапроса на строку. |
| | | 522 | | /// Индекса по IsReturned нет, поэтому скан Orders в первом запросе всё равно неизбежен — |
| | | 523 | | /// он выполняется раз в сутки в ночной полной сверке. |
| | | 524 | | /// |
| | | 525 | | /// Сами обновления — точечные UPDATE по первичному ключу батчами, а не UPDATE … JOIN: |
| | | 526 | | /// один оператор с JOIN держал X-lock на всех ~15 тыс. заказов с возвратами до своего |
| | | 527 | | /// завершения, и 14.09.2026 при стопоре диска это на 98 с заблокировало все UPDATE Orders |
| | | 528 | | /// (таймауты, KILL QUERY, сломанный кеш триггера — см. docs/mariadb-trigger-self-healing.md). |
| | | 529 | | /// SELECT — consistent read без блокировок, UPDATE по Id блокирует только меняемые строки. |
| | | 530 | | /// </remarks> |
| | | 531 | | public async Task<(int Cleared, int Set)> ReconcileIsReturnedFlagAsync() |
| | | 532 | | { |
| | 0 | 533 | | var previousTimeout = _context.Database.GetCommandTimeout(); |
| | 0 | 534 | | _context.Database.SetCommandTimeout(180); |
| | | 535 | | try |
| | | 536 | | { |
| | 0 | 537 | | var toClear = await _context.Database.SqlQueryRaw<int>( |
| | 0 | 538 | | @"SELECT o.Id AS Value |
| | 0 | 539 | | FROM Orders o |
| | 0 | 540 | | LEFT JOIN OrderReturns r ON r.OrderId = o.Id |
| | 0 | 541 | | WHERE o.IsReturned = 1 AND r.Id IS NULL").ToListAsync(); |
| | | 542 | | |
| | 0 | 543 | | var toSet = await _context.Database.SqlQueryRaw<int>( |
| | 0 | 544 | | @"SELECT o.Id AS Value |
| | 0 | 545 | | FROM Orders o |
| | 0 | 546 | | JOIN (SELECT DISTINCT OrderId FROM OrderReturns WHERE OrderId IS NOT NULL) r |
| | 0 | 547 | | ON r.OrderId = o.Id |
| | 0 | 548 | | WHERE o.IsReturned = 0").ToListAsync(); |
| | | 549 | | |
| | 0 | 550 | | var cleared = await SetIsReturnedInChunksAsync(toClear, isReturned: false); |
| | 0 | 551 | | var set = await SetIsReturnedInChunksAsync(toSet, isReturned: true); |
| | | 552 | | |
| | 0 | 553 | | return (cleared, set); |
| | | 554 | | } |
| | | 555 | | finally |
| | | 556 | | { |
| | 0 | 557 | | _context.Database.SetCommandTimeout(previousTimeout); |
| | | 558 | | } |
| | 0 | 559 | | } |
| | | 560 | | |
| | | 561 | | private async Task<int> SetIsReturnedInChunksAsync(IReadOnlyCollection<int> orderIds, bool isReturned) |
| | | 562 | | { |
| | | 563 | | const int chunkSize = 500; |
| | 0 | 564 | | var affected = 0; |
| | 0 | 565 | | foreach (var chunk in orderIds.Chunk(chunkSize)) |
| | 0 | 566 | | affected += await SetIsReturnedForOrderIdsAsync(chunk, isReturned); |
| | 0 | 567 | | return affected; |
| | 0 | 568 | | } |
| | | 569 | | |
| | | 570 | | /// <summary>Загрузить заказы для обновления статуса из Ozon — минимальный набор полей (Id, ShipmentNumber, Ozon |
| | | 571 | | public async Task<List<Order>> GetOrdersForStatusUpdateAsync(IEnumerable<int> orderIds) |
| | | 572 | | { |
| | 0 | 573 | | var idList = orderIds?.Distinct().ToList() ?? new List<int>(); |
| | 0 | 574 | | if (idList.Count == 0) |
| | 0 | 575 | | return new List<Order>(); |
| | | 576 | | |
| | 0 | 577 | | return await _context.Orders |
| | 0 | 578 | | .Where(o => o.OrderArchive == null && idList.Contains(o.Id)) |
| | 0 | 579 | | .Include(o => o.OzonClient) |
| | 0 | 580 | | .Include(o => o.ClientStatus) |
| | 0 | 581 | | .ToListAsync(); |
| | 0 | 582 | | } |
| | | 583 | | |
| | | 584 | | public async Task<List<Order>> GetOrdersWithPagination(int skip, int take) |
| | | 585 | | { |
| | 1 | 586 | | if (skip < 0) skip = 0; |
| | 1 | 587 | | if (take <= 0) take = 15; |
| | | 588 | | |
| | | 589 | | // Оптимизированный подход: сначала получаем ID заказов, затем загружаем данные |
| | | 590 | | // Это быстрее чем один большой запрос с множеством JOIN'ов |
| | 1 | 591 | | var orderIds = await _context.Orders |
| | 1 | 592 | | .AsNoTracking() |
| | 1 | 593 | | .Where(o => o.OrderArchive == null) |
| | 1 | 594 | | .OrderByDescending(o => o.ProcessingDate) |
| | 1 | 595 | | .Select(o => o.Id) |
| | 1 | 596 | | .Skip(skip) |
| | 1 | 597 | | .Take(take) |
| | 1 | 598 | | .ToListAsync(); |
| | | 599 | | |
| | 1 | 600 | | if (!orderIds.Any()) |
| | 1 | 601 | | return new List<Order>(); |
| | | 602 | | |
| | | 603 | | // Загружаем полные данные только для нужных заказов БЕЗ OrderExtensions |
| | 0 | 604 | | var orderList = await _context.Orders |
| | 0 | 605 | | .AsNoTracking() |
| | 0 | 606 | | .Where(o => orderIds.Contains(o.Id)) |
| | 0 | 607 | | .Include(c => c.Сurrency) |
| | 0 | 608 | | .Include(w => w.ShipmentWarehouse) |
| | 0 | 609 | | .Include(p => p.ProductInfo!) |
| | 0 | 610 | | .ThenInclude(r => r.ReplacementProduct) |
| | 0 | 611 | | .Include(a => a.AppStatus!) |
| | 0 | 612 | | .ThenInclude(s => s.StatusColor) |
| | 0 | 613 | | .Include(cs => cs.ClientStatus) |
| | 0 | 614 | | .Include(s => s.Supplier) |
| | 0 | 615 | | .Include(o => o.OzonClient) |
| | 0 | 616 | | .Include(m => m.Manufacturer) |
| | 0 | 617 | | .Include(f => f.ExcelFileData) |
| | 0 | 618 | | .Include(d => d.Delivery!) |
| | 0 | 619 | | .ThenInclude(dp => dp.Provider) |
| | 0 | 620 | | .Include(e => e.EtProducer) |
| | 0 | 621 | | .Include(o => o.OrderPrice!) |
| | 0 | 622 | | .ThenInclude(o => o.PriceIndexes) |
| | 0 | 623 | | .AsSplitQuery() |
| | 0 | 624 | | .ToListAsync(); |
| | | 625 | | |
| | | 626 | | // Сортируем по исходному порядку orderIds |
| | | 627 | | // Удаляем дубликаты перед созданием словаря (на случай если они появились) |
| | 0 | 628 | | orderList = orderList.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | 0 | 629 | | var orderDict = orderList.ToDictionary(o => o.Id); |
| | 0 | 630 | | orderList = orderIds.Select(id => orderDict.GetValueOrDefault(id)).OfType<Order>().ToList(); |
| | | 631 | | |
| | | 632 | | // OrderExtensions, ExtraExpenses и OrderItems НЕ загружаются здесь, чтобы оптимизировать загрузку страницы |
| | | 633 | | // Они будут загружены позже только для заказов, которые попадут на страницу (в контроллере) |
| | 0 | 634 | | foreach (var order in orderList) |
| | | 635 | | { |
| | 0 | 636 | | order.OrderExtensions = new List<OrderExtension>(); |
| | 0 | 637 | | order.ExtraExpenses ??= new List<OrderExtraExpense>(); |
| | | 638 | | } |
| | | 639 | | |
| | 0 | 640 | | return orderList; |
| | 1 | 641 | | } |
| | | 642 | | |
| | | 643 | | |
| | | 644 | | /// <summary> |
| | | 645 | | /// Возвращает общее количество заказов (асинхронно). |
| | | 646 | | /// </summary> |
| | | 647 | | public async Task<int> GetTotalOrderCount() |
| | | 648 | | { |
| | 0 | 649 | | return await GetTotalCount(); |
| | 0 | 650 | | } |
| | | 651 | | |
| | | 652 | | public async Task<int> GetReturnableCount() |
| | | 653 | | { |
| | 0 | 654 | | return await _context.Orders |
| | 0 | 655 | | .Where(o => o.IsReturnable == true) |
| | 0 | 656 | | .CountAsync(); |
| | 0 | 657 | | } |
| | | 658 | | |
| | | 659 | | /// <summary> |
| | | 660 | | /// Загружает полные данные заказов только для указанных ID (оптимизация для фильтрации). |
| | | 661 | | /// Использует батчинг для больших списков ID для улучшения производительности и избежания таймаутов. |
| | | 662 | | /// </summary> |
| | | 663 | | public async Task<List<Order>> GetOrdersByIds(List<int> orderIds, bool includeArchived) |
| | | 664 | | { |
| | 0 | 665 | | if (orderIds == null || !orderIds.Any()) |
| | 0 | 666 | | return new List<Order>(); |
| | | 667 | | |
| | | 668 | | // ОПТИМИЗАЦИЯ: Используем батчинг для больших списков ID |
| | | 669 | | // MySQL имеет ограничение на размер WHERE IN запросов, поэтому разбиваем на батчи |
| | | 670 | | // Уменьшенный размер батча для лучшей производительности и избежания таймаутов |
| | | 671 | | const int |
| | | 672 | | batchSize = 200; // Размер батча для WHERE IN запросов (оптимальный баланс между производительностью и к |
| | 0 | 673 | | var allOrders = new List<Order>(); |
| | | 674 | | |
| | | 675 | | // Разбиваем список ID на батчи для избежания больших WHERE IN запросов |
| | | 676 | | // Даже для небольших списков используем батчинг для единообразия |
| | 0 | 677 | | for (int i = 0; i < orderIds.Count; i += batchSize) |
| | | 678 | | { |
| | 0 | 679 | | var batchIds = orderIds.Skip(i).Take(batchSize).ToList(); |
| | | 680 | | |
| | 0 | 681 | | var query = BuildOrdersQuery(batchIds, includeArchived); |
| | 0 | 682 | | var batchOrders = await query.ToListAsync(); |
| | | 683 | | |
| | | 684 | | // Удаляем дубликаты в батче |
| | 0 | 685 | | batchOrders = batchOrders.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | | 686 | | |
| | 0 | 687 | | allOrders.AddRange(batchOrders); |
| | | 688 | | } |
| | | 689 | | |
| | | 690 | | // Удаляем дубликаты из всего списка (на случай если они появились между батчами) |
| | 0 | 691 | | allOrders = allOrders.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | | 692 | | |
| | | 693 | | // Инициализируем пустые коллекции OrderExtensions и ExtraExpenses (загружаются отдельно при необходимости) |
| | 0 | 694 | | foreach (var order in allOrders) |
| | | 695 | | { |
| | 0 | 696 | | order.OrderExtensions = new List<OrderExtension>(); |
| | 0 | 697 | | order.ExtraExpenses ??= new List<OrderExtraExpense>(); |
| | | 698 | | } |
| | | 699 | | |
| | 0 | 700 | | return allOrders; |
| | 0 | 701 | | } |
| | | 702 | | |
| | | 703 | | /// <summary> |
| | | 704 | | /// Загружает полные данные заказов по списку ID с включённым трэкингом (для последующего обновления и SaveChang |
| | | 705 | | /// Использует батчинг для больших списков ID. |
| | | 706 | | /// </summary> |
| | | 707 | | public async Task<List<Order>> GetOrdersByIdsTracked(List<int> orderIds, bool includeArchived) |
| | | 708 | | { |
| | 0 | 709 | | if (orderIds == null || !orderIds.Any()) |
| | 0 | 710 | | return new List<Order>(); |
| | | 711 | | |
| | | 712 | | const int batchSize = 200; |
| | 0 | 713 | | var allOrders = new List<Order>(); |
| | | 714 | | |
| | 0 | 715 | | for (int i = 0; i < orderIds.Count; i += batchSize) |
| | | 716 | | { |
| | 0 | 717 | | var batchIds = orderIds.Skip(i).Take(batchSize).ToList(); |
| | 0 | 718 | | var query = BuildOrdersQueryTracked(batchIds, includeArchived); |
| | 0 | 719 | | var batchOrders = await query.ToListAsync(); |
| | 0 | 720 | | batchOrders = batchOrders.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | 0 | 721 | | allOrders.AddRange(batchOrders); |
| | | 722 | | } |
| | | 723 | | |
| | 0 | 724 | | allOrders = allOrders.GroupBy(o => o.Id).Select(g => g.First()).ToList(); |
| | | 725 | | |
| | 0 | 726 | | foreach (var order in allOrders) |
| | | 727 | | { |
| | 0 | 728 | | order.OrderExtensions = new List<OrderExtension>(); |
| | 0 | 729 | | order.ExtraExpenses ??= new List<OrderExtraExpense>(); |
| | | 730 | | } |
| | | 731 | | |
| | 0 | 732 | | return allOrders; |
| | 0 | 733 | | } |
| | | 734 | | |
| | | 735 | | /// <summary> |
| | | 736 | | /// Строит запрос для загрузки заказов по списку ID (без трэкинга). |
| | | 737 | | /// </summary> |
| | | 738 | | private IQueryable<Order> BuildOrdersQuery(List<int> orderIds, bool includeArchived) |
| | | 739 | | { |
| | 0 | 740 | | var query = ApplyStandardIncludes( |
| | 0 | 741 | | _context.Orders.AsNoTracking().Where(o => orderIds.Contains(o.Id))); |
| | | 742 | | |
| | 0 | 743 | | if (includeArchived) |
| | 0 | 744 | | query = query.Include(o => o.OrderArchive); |
| | | 745 | | |
| | 0 | 746 | | return query; |
| | | 747 | | } |
| | | 748 | | |
| | | 749 | | /// <summary> |
| | | 750 | | /// Строит запрос для загрузки заказов по списку ID с трэкингом (для обновления и SaveChanges). |
| | | 751 | | /// </summary> |
| | | 752 | | private IQueryable<Order> BuildOrdersQueryTracked(List<int> orderIds, bool includeArchived) |
| | | 753 | | { |
| | 0 | 754 | | var query = ApplyStandardIncludes( |
| | 0 | 755 | | _context.Orders.Where(o => orderIds.Contains(o.Id))); |
| | | 756 | | |
| | 0 | 757 | | if (includeArchived) |
| | 0 | 758 | | query = query.Include(o => o.OrderArchive); |
| | | 759 | | |
| | 0 | 760 | | return query; |
| | | 761 | | } |
| | | 762 | | |
| | | 763 | | /// <summary> |
| | | 764 | | /// Загружает OrderExtensions только для указанных заказов (оптимизация для страницы). |
| | | 765 | | /// </summary> |
| | | 766 | | public async Task LoadOrderExtensionsForOrders(List<Order> orders) |
| | | 767 | | { |
| | 0 | 768 | | if (orders == null || !orders.Any()) |
| | 0 | 769 | | return; |
| | | 770 | | |
| | 0 | 771 | | var orderIds = orders.Select(o => o.Id).Distinct().ToList(); |
| | 0 | 772 | | if (!orderIds.Any()) |
| | 0 | 773 | | return; |
| | | 774 | | |
| | | 775 | | // Загружаем расширения одним запросом для всех заказов на странице |
| | 0 | 776 | | var orderExtensions = await _context.OrderExtensions |
| | 0 | 777 | | .AsNoTracking() |
| | 0 | 778 | | .Where(e => orderIds.Contains(e.OrderId)) |
| | 0 | 779 | | .ToListAsync(); |
| | | 780 | | |
| | 0 | 781 | | var extensionsByOrderId = orderExtensions |
| | 0 | 782 | | .GroupBy(e => e.OrderId) |
| | 0 | 783 | | .ToDictionary(g => g.Key, g => g.ToList()); |
| | | 784 | | |
| | | 785 | | // Присваиваем расширения заказам |
| | 0 | 786 | | foreach (var order in orders) |
| | | 787 | | { |
| | 0 | 788 | | if (extensionsByOrderId.TryGetValue(order.Id, out var extensions)) |
| | | 789 | | { |
| | 0 | 790 | | order.OrderExtensions = extensions; |
| | | 791 | | } |
| | | 792 | | else |
| | | 793 | | { |
| | 0 | 794 | | order.OrderExtensions = new List<OrderExtension>(); |
| | | 795 | | } |
| | | 796 | | } |
| | 0 | 797 | | } |
| | | 798 | | |
| | | 799 | | public async Task<IQueryable<KeyValuePair<string, int>>> GetUniqueValues<T>(Expression<Func<Order, T>> selector, |
| | | 800 | | Expression<Func<Order, bool>>? predicate = null) where T : class |
| | | 801 | | { |
| | 0 | 802 | | await Task.CompletedTask; |
| | 0 | 803 | | IQueryable<Order> query = _context.Orders; |
| | | 804 | | |
| | 0 | 805 | | if (predicate != null) |
| | | 806 | | { |
| | 0 | 807 | | query = query.Where(predicate); |
| | | 808 | | } |
| | | 809 | | |
| | 0 | 810 | | return query |
| | 0 | 811 | | .Select(selector) |
| | 0 | 812 | | .Where(value => value != null) |
| | 0 | 813 | | .GroupBy(value => value) |
| | 0 | 814 | | .Select(group => new KeyValuePair<string, int>(group.Key.ToString()!, group.Count())) |
| | 0 | 815 | | .AsQueryable(); |
| | 0 | 816 | | } |
| | | 817 | | |
| | | 818 | | public async Task<List<string>> GetShipmentNumbers() |
| | | 819 | | { |
| | 0 | 820 | | return await _context.Orders |
| | 0 | 821 | | .Where(o => o.ShipmentNumber != null) |
| | 0 | 822 | | .Select(o => o.ShipmentNumber!) |
| | 0 | 823 | | .ToListAsync(); |
| | 0 | 824 | | } |
| | | 825 | | |
| | | 826 | | /// <summary> |
| | | 827 | | /// Возвращает уникальные базовые номера отправлений (до первого '-') с количеством. |
| | | 828 | | /// Оптимизация: загружает только ShipmentNumber (без Include), группировка в памяти. |
| | | 829 | | /// </summary> |
| | | 830 | | public async Task<Dictionary<string, int>> GetUniqueShipmentNumbersGrouped() |
| | | 831 | | { |
| | 0 | 832 | | var numbers = await _context.Orders |
| | 0 | 833 | | .AsNoTracking() |
| | 0 | 834 | | .Where(o => o.ShipmentNumber != null) |
| | 0 | 835 | | .Select(o => o.ShipmentNumber!) |
| | 0 | 836 | | .ToListAsync(); |
| | | 837 | | |
| | 0 | 838 | | return numbers |
| | 0 | 839 | | .Select(sn => sn.Split('-')[0]) |
| | 0 | 840 | | .GroupBy(sn => sn) |
| | 0 | 841 | | .ToDictionary(g => g.Key, g => g.Count()); |
| | 0 | 842 | | } |
| | | 843 | | |
| | | 844 | | private void LoadAdditionalData(List<Order> orders) |
| | | 845 | | { |
| | | 846 | | // Загрузка CartItemStatus для всех заказов одним запросом |
| | 0 | 847 | | var orderIdsWithCartItem = orders |
| | 0 | 848 | | .Where(order => order.CartItemId.HasValue) |
| | 0 | 849 | | .Select(order => order.Id) |
| | 0 | 850 | | .Distinct() |
| | 0 | 851 | | .ToList(); |
| | | 852 | | |
| | 0 | 853 | | if (orderIdsWithCartItem.Any()) |
| | | 854 | | { |
| | 0 | 855 | | var orderItemsWithStatus = _context.OrderItems |
| | 0 | 856 | | .Include(oi => oi.ItemStatus!) |
| | 0 | 857 | | .ThenInclude(ist => ist.StatusColor) |
| | 0 | 858 | | .Where(oi => orderIdsWithCartItem.Contains(oi.StudioOrderId ?? 0)) |
| | 0 | 859 | | .AsNoTracking() |
| | 0 | 860 | | .ToList(); |
| | | 861 | | |
| | 0 | 862 | | var orderItemsByOrderId = orderItemsWithStatus |
| | 0 | 863 | | .GroupBy(oi => oi.StudioOrderId) |
| | 0 | 864 | | .ToDictionary(g => g.Key ?? 0, g => g.FirstOrDefault()); |
| | | 865 | | |
| | 0 | 866 | | foreach (var order in orders) |
| | | 867 | | { |
| | 0 | 868 | | if (order.CartItemId.HasValue) |
| | | 869 | | { |
| | 0 | 870 | | if (orderItemsByOrderId.TryGetValue(order.Id, out var orderItem)) |
| | | 871 | | { |
| | 0 | 872 | | order.CartItemStatus = orderItem?.ItemStatus; |
| | 0 | 873 | | order.CartItemStatusColor = orderItem?.ItemStatus?.StatusColor; |
| | | 874 | | } |
| | | 875 | | else |
| | | 876 | | { |
| | 0 | 877 | | order.CartItemStatus = null; |
| | 0 | 878 | | order.CartItemStatusColor = null; |
| | | 879 | | } |
| | | 880 | | } |
| | | 881 | | } |
| | | 882 | | } |
| | | 883 | | |
| | | 884 | | // Загрузка StatusColor для ClientStatus отдельным запросом (оптимизация производительности) |
| | 0 | 885 | | var clientStatusIds = orders |
| | 0 | 886 | | .Where(order => order.ClientStatusId.HasValue) |
| | 0 | 887 | | .Select(order => order.ClientStatusId!.Value) |
| | 0 | 888 | | .Distinct() |
| | 0 | 889 | | .ToList(); |
| | | 890 | | |
| | 0 | 891 | | if (clientStatusIds.Any()) |
| | | 892 | | { |
| | 0 | 893 | | var clientStatusesWithColors = _context.ClientStatuses |
| | 0 | 894 | | .Include(cs => cs.StatusColor) |
| | 0 | 895 | | .Where(cs => clientStatusIds.Contains(cs.Id)) |
| | 0 | 896 | | .AsNoTracking() |
| | 0 | 897 | | .ToList(); |
| | | 898 | | |
| | 0 | 899 | | var clientStatusesById = clientStatusesWithColors |
| | 0 | 900 | | .ToDictionary(cs => cs.Id, cs => cs); |
| | | 901 | | |
| | 0 | 902 | | foreach (var order in orders) |
| | | 903 | | { |
| | 0 | 904 | | if (order.ClientStatusId.HasValue && |
| | 0 | 905 | | clientStatusesById.TryGetValue(order.ClientStatusId.Value, out var clientStatusWithColor)) |
| | | 906 | | { |
| | 0 | 907 | | order.ClientStatus = clientStatusWithColor; |
| | | 908 | | } |
| | | 909 | | } |
| | | 910 | | } |
| | 0 | 911 | | } |
| | | 912 | | |
| | | 913 | | /// <summary> |
| | | 914 | | /// Загружает OrderItems (CartItemStatus) и StatusColor для ClientStatus только для указанных заказов (оптимизац |
| | | 915 | | /// </summary> |
| | | 916 | | public async Task LoadOrderItemsForOrders(List<Order> orders) |
| | | 917 | | { |
| | 1 | 918 | | if (orders == null || !orders.Any()) |
| | 0 | 919 | | return; |
| | | 920 | | |
| | | 921 | | // Загрузка CartItemStatus только для заказов на странице |
| | 1 | 922 | | var orderIdsWithCartItem = orders |
| | 1 | 923 | | .Where(order => order.CartItemId.HasValue) |
| | 0 | 924 | | .Select(order => order.Id) |
| | 1 | 925 | | .Distinct() |
| | 1 | 926 | | .ToList(); |
| | | 927 | | |
| | 1 | 928 | | if (orderIdsWithCartItem.Any()) |
| | | 929 | | { |
| | | 930 | | // Загружаем OrderItems одним запросом для всех заказов на странице |
| | 0 | 931 | | var orderItemsWithStatus = await _context.OrderItems |
| | 0 | 932 | | .Include(oi => oi.ItemStatus!) |
| | 0 | 933 | | .ThenInclude(ist => ist.StatusColor) |
| | 0 | 934 | | .Where(oi => orderIdsWithCartItem.Contains(oi.StudioOrderId ?? 0)) |
| | 0 | 935 | | .AsNoTracking() |
| | 0 | 936 | | .ToListAsync(); |
| | | 937 | | |
| | 0 | 938 | | var orderItemsByOrderId = orderItemsWithStatus |
| | 0 | 939 | | .GroupBy(oi => oi.StudioOrderId) |
| | 0 | 940 | | .ToDictionary(g => g.Key ?? 0, g => g.FirstOrDefault()); |
| | | 941 | | |
| | 0 | 942 | | foreach (var order in orders) |
| | | 943 | | { |
| | 0 | 944 | | if (order.CartItemId.HasValue) |
| | | 945 | | { |
| | 0 | 946 | | if (orderItemsByOrderId.TryGetValue(order.Id, out var orderItem)) |
| | | 947 | | { |
| | 0 | 948 | | order.CartItemStatus = orderItem?.ItemStatus; |
| | 0 | 949 | | order.CartItemStatusColor = orderItem?.ItemStatus?.StatusColor; |
| | | 950 | | } |
| | | 951 | | else |
| | | 952 | | { |
| | 0 | 953 | | order.CartItemStatus = null; |
| | 0 | 954 | | order.CartItemStatusColor = null; |
| | | 955 | | } |
| | | 956 | | } |
| | | 957 | | } |
| | | 958 | | } |
| | | 959 | | |
| | | 960 | | // Загрузка StatusColor для ClientStatus отдельным запросом (оптимизация производительности) |
| | | 961 | | // ВАЖНО: Загружаем цвета для всех заказов на странице, даже если нет CartItemId |
| | 1 | 962 | | var clientStatusIds = orders |
| | 1 | 963 | | .Where(order => order.ClientStatusId.HasValue) |
| | 0 | 964 | | .Select(order => order.ClientStatusId!.Value) |
| | 1 | 965 | | .Distinct() |
| | 1 | 966 | | .ToList(); |
| | | 967 | | |
| | 1 | 968 | | if (clientStatusIds.Any()) |
| | | 969 | | { |
| | 0 | 970 | | var clientStatusesWithColors = await _context.ClientStatuses |
| | 0 | 971 | | .Include(cs => cs.StatusColor) |
| | 0 | 972 | | .Where(cs => clientStatusIds.Contains(cs.Id)) |
| | 0 | 973 | | .AsNoTracking() |
| | 0 | 974 | | .ToListAsync(); |
| | | 975 | | |
| | 0 | 976 | | var clientStatusesById = clientStatusesWithColors |
| | 0 | 977 | | .ToDictionary(cs => cs.Id, cs => cs); |
| | | 978 | | |
| | 0 | 979 | | foreach (var order in orders) |
| | | 980 | | { |
| | 0 | 981 | | if (order.ClientStatusId.HasValue && |
| | 0 | 982 | | clientStatusesById.TryGetValue(order.ClientStatusId.Value, out var clientStatusWithColor)) |
| | | 983 | | { |
| | | 984 | | // Заменяем ClientStatus полностью, чтобы гарантировать наличие StatusColor |
| | | 985 | | // Это работает даже если ClientStatus был загружен без StatusColor в основном запросе |
| | 0 | 986 | | order.ClientStatus = clientStatusWithColor; |
| | | 987 | | } |
| | | 988 | | } |
| | | 989 | | } |
| | 1 | 990 | | } |
| | | 991 | | |
| | | 992 | | /// <summary> |
| | | 993 | | /// Загружает ExtraExpenses (дополнительные расходы) с ExpenseType только для указанных заказов (оптимизация для |
| | | 994 | | /// </summary> |
| | | 995 | | public async Task LoadExtraExpensesForOrders(List<Order> orders) |
| | | 996 | | { |
| | 0 | 997 | | if (orders == null || !orders.Any()) |
| | 0 | 998 | | return; |
| | | 999 | | |
| | 0 | 1000 | | var orderIds = orders.Select(o => o.Id).Distinct().ToList(); |
| | 0 | 1001 | | if (!orderIds.Any()) |
| | 0 | 1002 | | return; |
| | | 1003 | | |
| | | 1004 | | // Загружаем дополнительные расходы одним запросом для всех заказов на странице |
| | 0 | 1005 | | var extraExpenses = await _context.OrderExtraExpenses |
| | 0 | 1006 | | .AsNoTracking() |
| | 0 | 1007 | | .Include(e => e.ExpenseType) |
| | 0 | 1008 | | .Where(e => orderIds.Contains(e.OrderId)) |
| | 0 | 1009 | | .ToListAsync(); |
| | | 1010 | | |
| | 0 | 1011 | | var expensesByOrderId = extraExpenses |
| | 0 | 1012 | | .GroupBy(e => e.OrderId) |
| | 0 | 1013 | | .ToDictionary(g => g.Key, g => g.ToList()); |
| | | 1014 | | |
| | | 1015 | | // Присваиваем расходы заказам |
| | 0 | 1016 | | foreach (var order in orders) |
| | | 1017 | | { |
| | 0 | 1018 | | if (expensesByOrderId.TryGetValue(order.Id, out var expenses)) |
| | | 1019 | | { |
| | 0 | 1020 | | order.ExtraExpenses = expenses; |
| | | 1021 | | } |
| | | 1022 | | else |
| | | 1023 | | { |
| | 0 | 1024 | | order.ExtraExpenses = new List<OrderExtraExpense>(); |
| | | 1025 | | } |
| | | 1026 | | } |
| | 0 | 1027 | | } |
| | | 1028 | | |
| | | 1029 | | public async Task<int> Delete(Order value) |
| | | 1030 | | { |
| | 0 | 1031 | | _context.Orders.Remove(value); |
| | 0 | 1032 | | return await _context.SaveChangesAsync(); |
| | 0 | 1033 | | } |
| | | 1034 | | |
| | | 1035 | | public async Task<int> GetTotalCount() |
| | | 1036 | | { |
| | 0 | 1037 | | return await _context.Orders.CountAsync(); |
| | 0 | 1038 | | } |
| | | 1039 | | |
| | | 1040 | | public async Task<string?> GetZasylAsync(int orderId) |
| | | 1041 | | { |
| | 3 | 1042 | | var item = await _context.OrderExtensions |
| | 3 | 1043 | | .AsNoTracking() |
| | 3 | 1044 | | .FirstOrDefaultAsync(x => x.OrderId == orderId && x.Key == ZASYL_KEY); |
| | 3 | 1045 | | return item?.Value; |
| | 3 | 1046 | | } |
| | | 1047 | | |
| | | 1048 | | public async Task<bool> HasZasylValueAsync(string value) |
| | | 1049 | | { |
| | 0 | 1050 | | if (string.IsNullOrEmpty(value)) |
| | 0 | 1051 | | return false; |
| | | 1052 | | |
| | 0 | 1053 | | return await _context.OrderExtensions |
| | 0 | 1054 | | .AsNoTracking() |
| | 0 | 1055 | | .AnyAsync(x => x.Key == ZASYL_KEY && x.Value == value); |
| | 0 | 1056 | | } |
| | | 1057 | | |
| | | 1058 | | |
| | | 1059 | | public async Task SetZasylAsync(int orderId, string? value) |
| | | 1060 | | { |
| | 1 | 1061 | | if (value == null) |
| | | 1062 | | { |
| | 0 | 1063 | | await _context.Database.ExecuteSqlRawAsync( |
| | 0 | 1064 | | BuildDeleteZasylSql(), orderId, ZASYL_KEY); |
| | | 1065 | | } |
| | | 1066 | | else |
| | | 1067 | | { |
| | 1 | 1068 | | await _context.Database.ExecuteSqlRawAsync( |
| | 1 | 1069 | | BuildUpsertZasylSql(), orderId, ZASYL_KEY, value); |
| | | 1070 | | } |
| | 1 | 1071 | | } |
| | | 1072 | | |
| | | 1073 | | public async Task SetZasylAsync(Dictionary<int, string?> orderSupplierMap) |
| | | 1074 | | { |
| | 1 | 1075 | | if (orderSupplierMap == null || orderSupplierMap.Count == 0) |
| | 0 | 1076 | | return; |
| | | 1077 | | |
| | 1 | 1078 | | var sql = BuildUpsertZasylSql(); |
| | 6 | 1079 | | foreach (var kvp in orderSupplierMap) |
| | | 1080 | | { |
| | 2 | 1081 | | if (kvp.Value == null) continue; |
| | 2 | 1082 | | await _context.Database.ExecuteSqlRawAsync(sql, kvp.Key, ZASYL_KEY, kvp.Value); |
| | | 1083 | | } |
| | 1 | 1084 | | } |
| | | 1085 | | |
| | | 1086 | | private string BuildUpsertZasylSql() |
| | | 1087 | | { |
| | 2 | 1088 | | var provider = _context.Database.ProviderName ?? string.Empty; |
| | 2 | 1089 | | if (provider.Contains("Sqlite", StringComparison.OrdinalIgnoreCase)) |
| | | 1090 | | { |
| | 2 | 1091 | | return "INSERT INTO order_extensions (OrderId, Key, Value, CreatedAt) " + |
| | 2 | 1092 | | "VALUES ({0}, {1}, {2}, CURRENT_TIMESTAMP) " + |
| | 2 | 1093 | | "ON CONFLICT(OrderId, Key) DO UPDATE SET Value = excluded.Value"; |
| | | 1094 | | } |
| | 0 | 1095 | | return "INSERT INTO order_extensions (OrderId, `Key`, Value, CreatedAt) " + |
| | 0 | 1096 | | "VALUES ({0}, {1}, {2}, UTC_TIMESTAMP()) " + |
| | 0 | 1097 | | "ON DUPLICATE KEY UPDATE Value = {2}"; |
| | | 1098 | | } |
| | | 1099 | | |
| | | 1100 | | private string BuildDeleteZasylSql() |
| | | 1101 | | { |
| | 0 | 1102 | | var provider = _context.Database.ProviderName ?? string.Empty; |
| | 0 | 1103 | | if (provider.Contains("Sqlite", StringComparison.OrdinalIgnoreCase)) |
| | 0 | 1104 | | return "DELETE FROM order_extensions WHERE OrderId = {0} AND Key = {1}"; |
| | 0 | 1105 | | return "DELETE FROM order_extensions WHERE OrderId = {0} AND `Key` = {1}"; |
| | | 1106 | | } |
| | | 1107 | | |
| | | 1108 | | public async Task<List<string>> GetAllZasylValuesAsync() |
| | | 1109 | | { |
| | 0 | 1110 | | return await _context.OrderExtensions |
| | 0 | 1111 | | .AsNoTracking() |
| | 0 | 1112 | | .Where(e => e.Key == ZASYL_KEY && e.Value != null && e.Value != "") |
| | 0 | 1113 | | .Select(e => e.Value!) |
| | 0 | 1114 | | .Distinct() |
| | 0 | 1115 | | .OrderBy(v => v) |
| | 0 | 1116 | | .ToListAsync(); |
| | 0 | 1117 | | } |
| | | 1118 | | |
| | | 1119 | | public async Task SetTransactionDocumentAsync(int orderId, string? value) |
| | | 1120 | | { |
| | 0 | 1121 | | var item = await _context.OrderExtensions |
| | 0 | 1122 | | .FirstOrDefaultAsync(x => x.OrderId == orderId && x.Key == TRANSACTION_DOCUMENT_KEY); |
| | | 1123 | | |
| | 0 | 1124 | | if (item == null) |
| | | 1125 | | { |
| | 0 | 1126 | | item = new OrderExtension |
| | 0 | 1127 | | { |
| | 0 | 1128 | | OrderId = orderId, |
| | 0 | 1129 | | Key = TRANSACTION_DOCUMENT_KEY, |
| | 0 | 1130 | | Value = value |
| | 0 | 1131 | | }; |
| | 0 | 1132 | | _context.OrderExtensions.Add(item); |
| | | 1133 | | } |
| | | 1134 | | else |
| | | 1135 | | { |
| | 0 | 1136 | | item.Value = value; |
| | 0 | 1137 | | _context.OrderExtensions.Update(item); |
| | | 1138 | | } |
| | | 1139 | | |
| | 0 | 1140 | | await _context.SaveChangesAsync(); |
| | 0 | 1141 | | } |
| | | 1142 | | |
| | | 1143 | | public async Task<string?> GetTransactionDocument(int orderId) |
| | | 1144 | | { |
| | 0 | 1145 | | var item = await _context.OrderExtensions |
| | 0 | 1146 | | .AsNoTracking() |
| | 0 | 1147 | | .FirstOrDefaultAsync(x => x.OrderId == orderId && x.Key == TRANSACTION_DOCUMENT_KEY); |
| | 0 | 1148 | | return item?.Value; |
| | 0 | 1149 | | } |
| | | 1150 | | |
| | | 1151 | | /// <summary> |
| | | 1152 | | /// Получить заказ по номеру отправления (ShipmentNumber) с учетом клиента |
| | | 1153 | | /// Поддерживает поиск как по полному номеру (69243155-0026-4), так и по частичному (69243155-0026) |
| | | 1154 | | /// </summary> |
| | | 1155 | | public async Task<Order?> GetOrderByShipmentNumberAsync(string shipmentNumber, int clientId) |
| | | 1156 | | { |
| | 0 | 1157 | | if (string.IsNullOrEmpty(shipmentNumber) || clientId <= 0) |
| | 0 | 1158 | | return null; |
| | | 1159 | | |
| | 0 | 1160 | | return await _context.Orders |
| | 0 | 1161 | | .AsNoTracking() |
| | 0 | 1162 | | .Where(o => o.OrderArchive == null && o.OzonClientId == clientId) // Только активные заказы конкретного |
| | 0 | 1163 | | .Include(o => o.OzonClient) |
| | 0 | 1164 | | .Include(o => o.AppStatus) |
| | 0 | 1165 | | .Include(o => o.ClientStatus) |
| | 0 | 1166 | | .Include(o => o.ProductInfo) |
| | 0 | 1167 | | .FirstOrDefaultAsync(o => o.ShipmentNumber == shipmentNumber || |
| | 0 | 1168 | | (o.ShipmentNumber != null && o.ShipmentNumber.StartsWith(shipmentNumber + "-") |
| | 0 | 1169 | | } |
| | | 1170 | | |
| | | 1171 | | private const int ShipmentNumberBatchSize = 100; |
| | | 1172 | | private const int PrefixBatchSize = 30; |
| | | 1173 | | |
| | | 1174 | | /// <summary> |
| | | 1175 | | /// Батч-поиск OrderId по номерам отправления. Запросы батчами для избежания Stack Overflow при большом числе но |
| | | 1176 | | /// Возвращает словарь: номер → OrderId. Поддерживает точное совпадение и префикс (ShipmentNumber LIKE number + |
| | | 1177 | | /// </summary> |
| | | 1178 | | public async Task<Dictionary<string, int>> GetOrderIdsByShipmentNumbersAsync(IEnumerable<string> numbers) |
| | | 1179 | | { |
| | 13 | 1180 | | var numberList = numbers.Where(n => !string.IsNullOrEmpty(n)).Distinct().ToList(); |
| | 7 | 1181 | | if (numberList.Count == 0) |
| | 1 | 1182 | | return new Dictionary<string, int>(); |
| | | 1183 | | |
| | 6 | 1184 | | var result = new Dictionary<string, int>(); |
| | | 1185 | | |
| | 24 | 1186 | | for (int i = 0; i < numberList.Count; i += ShipmentNumberBatchSize) |
| | | 1187 | | { |
| | 6 | 1188 | | var batch = numberList.Skip(i).Take(ShipmentNumberBatchSize).ToList(); |
| | 6 | 1189 | | var orders = await _context.Orders |
| | 6 | 1190 | | .AsNoTracking() |
| | 6 | 1191 | | .Where(o => o.OrderArchive == null && batch.Contains(o.ShipmentNumber!)) |
| | 6 | 1192 | | .Select(o => new { o.Id, o.ShipmentNumber }) |
| | 6 | 1193 | | .ToListAsync(); |
| | | 1194 | | |
| | 16 | 1195 | | foreach (var order in orders) |
| | | 1196 | | { |
| | 2 | 1197 | | if (order.ShipmentNumber != null) |
| | 2 | 1198 | | result[order.ShipmentNumber] = order.Id; |
| | | 1199 | | } |
| | | 1200 | | } |
| | | 1201 | | |
| | 12 | 1202 | | var notFound = numberList.Where(n => !result.ContainsKey(n)).ToList(); |
| | 6 | 1203 | | if (notFound.Count > 0) |
| | | 1204 | | { |
| | 4 | 1205 | | var prefixOrders = await GetOrdersByShipmentNumberPrefixesBatchedAsync(notFound); |
| | 16 | 1206 | | foreach (var number in notFound) |
| | | 1207 | | { |
| | 4 | 1208 | | var prefix = number + "-"; |
| | 4 | 1209 | | var order = prefixOrders.FirstOrDefault(o => |
| | 4 | 1210 | | o.ShipmentNumber != null && o.ShipmentNumber.StartsWith(prefix)); |
| | 4 | 1211 | | if (order.ShipmentNumber != null) |
| | 0 | 1212 | | result[number] = order.Id; |
| | | 1213 | | } |
| | | 1214 | | } |
| | | 1215 | | |
| | 6 | 1216 | | return result; |
| | 7 | 1217 | | } |
| | | 1218 | | |
| | | 1219 | | /// <summary> |
| | | 1220 | | /// Батч-поиск OrderId по номерам отправления в рамках конкретного Ozon-клиента. |
| | | 1221 | | /// </summary> |
| | | 1222 | | public async Task<Dictionary<string, int>> GetOrderIdsByShipmentNumbersAsync(IEnumerable<string> numbers, int oz |
| | | 1223 | | { |
| | 0 | 1224 | | var numberList = numbers.Where(n => !string.IsNullOrEmpty(n)).Distinct().ToList(); |
| | 0 | 1225 | | if (numberList.Count == 0 || ozonClientId <= 0) |
| | 0 | 1226 | | return new Dictionary<string, int>(); |
| | | 1227 | | |
| | 0 | 1228 | | var result = new Dictionary<string, int>(); |
| | | 1229 | | |
| | 0 | 1230 | | for (int i = 0; i < numberList.Count; i += ShipmentNumberBatchSize) |
| | | 1231 | | { |
| | 0 | 1232 | | var batch = numberList.Skip(i).Take(ShipmentNumberBatchSize).ToList(); |
| | 0 | 1233 | | var orders = await _context.Orders |
| | 0 | 1234 | | .AsNoTracking() |
| | 0 | 1235 | | .Where(o => o.OrderArchive == null && o.OzonClientId == ozonClientId && |
| | 0 | 1236 | | batch.Contains(o.ShipmentNumber!)) |
| | 0 | 1237 | | .Select(o => new { o.Id, o.ShipmentNumber }) |
| | 0 | 1238 | | .ToListAsync(); |
| | | 1239 | | |
| | 0 | 1240 | | foreach (var order in orders) |
| | | 1241 | | { |
| | 0 | 1242 | | if (order.ShipmentNumber != null) |
| | 0 | 1243 | | result[order.ShipmentNumber] = order.Id; |
| | | 1244 | | } |
| | 0 | 1245 | | } |
| | | 1246 | | |
| | 0 | 1247 | | var notFound = numberList.Where(n => !result.ContainsKey(n)).ToList(); |
| | 0 | 1248 | | if (notFound.Count > 0) |
| | | 1249 | | { |
| | 0 | 1250 | | var prefixOrders = await GetOrdersByShipmentNumberPrefixesBatchedAsync(notFound, ozonClientId); |
| | 0 | 1251 | | foreach (var number in notFound) |
| | | 1252 | | { |
| | 0 | 1253 | | var prefix = number + "-"; |
| | 0 | 1254 | | var order = prefixOrders.FirstOrDefault(o => |
| | 0 | 1255 | | o.ShipmentNumber != null && o.ShipmentNumber.StartsWith(prefix)); |
| | 0 | 1256 | | if (order.ShipmentNumber != null) |
| | 0 | 1257 | | result[number] = order.Id; |
| | | 1258 | | } |
| | | 1259 | | } |
| | | 1260 | | |
| | 0 | 1261 | | return result; |
| | 0 | 1262 | | } |
| | | 1263 | | |
| | | 1264 | | /// <summary> |
| | | 1265 | | /// Лёгкая карточная проекция Id → (ShipmentNumber, Article, клиент Ozon, статусы с их системными |
| | | 1266 | | /// цветами) для уже известных OrderId. Без лишних Include — только то, что нужно для отображения. |
| | | 1267 | | /// </summary> |
| | | 1268 | | public async Task<Dictionary<int, OrderHandoverMatchInfo>> GetHandoverMatchInfoByIdsAsync(IEnumerable<int> order |
| | | 1269 | | { |
| | 7 | 1270 | | var ids = orderIds.Distinct().ToList(); |
| | 7 | 1271 | | if (ids.Count == 0) |
| | 5 | 1272 | | return new Dictionary<int, OrderHandoverMatchInfo>(); |
| | | 1273 | | |
| | 2 | 1274 | | var result = new Dictionary<int, OrderHandoverMatchInfo>(); |
| | 8 | 1275 | | for (int i = 0; i < ids.Count; i += ShipmentNumberBatchSize) |
| | | 1276 | | { |
| | 2 | 1277 | | var batch = ids.Skip(i).Take(ShipmentNumberBatchSize).ToList(); |
| | 2 | 1278 | | var orders = await _context.Orders |
| | 2 | 1279 | | .AsNoTracking() |
| | 2 | 1280 | | .Where(o => batch.Contains(o.Id)) |
| | 2 | 1281 | | .Select(o => new OrderHandoverMatchInfo |
| | 2 | 1282 | | { |
| | 2 | 1283 | | Id = o.Id, |
| | 2 | 1284 | | ShipmentNumber = o.ShipmentNumber, |
| | 2 | 1285 | | Article = o.Article, |
| | 2 | 1286 | | ClientName = o.OzonClient != null ? o.OzonClient.Name : null, |
| | 2 | 1287 | | ClientStatusName = o.ClientStatus != null ? o.ClientStatus.Name : null, |
| | 2 | 1288 | | ClientStatusColor = o.ClientStatus != null && o.ClientStatus.StatusColor != null ? o.ClientStatu |
| | 2 | 1289 | | AppStatusName = o.AppStatus != null ? o.AppStatus.Name : null, |
| | 2 | 1290 | | AppStatusColor = o.AppStatus != null && o.AppStatus.StatusColor != null ? o.AppStatus.StatusColo |
| | 2 | 1291 | | }) |
| | 2 | 1292 | | .ToListAsync(); |
| | | 1293 | | |
| | 8 | 1294 | | foreach (var order in orders) |
| | 2 | 1295 | | result[order.Id] = order; |
| | | 1296 | | } |
| | | 1297 | | |
| | 2 | 1298 | | return result; |
| | 7 | 1299 | | } |
| | | 1300 | | |
| | | 1301 | | private async Task<List<(int Id, string? ShipmentNumber)>> GetOrdersByShipmentNumberPrefixesBatchedAsync(List<st |
| | | 1302 | | { |
| | 4 | 1303 | | if (numbers.Count == 0) |
| | 0 | 1304 | | return new List<(int Id, string? ShipmentNumber)>(); |
| | | 1305 | | |
| | 4 | 1306 | | var allResults = new List<(int Id, string? ShipmentNumber)>(); |
| | 16 | 1307 | | for (int i = 0; i < numbers.Count; i += PrefixBatchSize) |
| | | 1308 | | { |
| | 8 | 1309 | | var batch = numbers.Skip(i).Take(PrefixBatchSize).Select(n => n + "-").ToList(); |
| | 4 | 1310 | | var batchResults = await GetOrdersByShipmentNumberPrefixesAsync(batch); |
| | 4 | 1311 | | allResults.AddRange(batchResults); |
| | | 1312 | | } |
| | 4 | 1313 | | return allResults; |
| | 4 | 1314 | | } |
| | | 1315 | | |
| | | 1316 | | private async Task<List<(int Id, string? ShipmentNumber)>> GetOrdersByShipmentNumberPrefixesBatchedAsync(List<st |
| | | 1317 | | { |
| | 0 | 1318 | | if (numbers.Count == 0 || ozonClientId <= 0) |
| | 0 | 1319 | | return new List<(int Id, string? ShipmentNumber)>(); |
| | | 1320 | | |
| | 0 | 1321 | | var allResults = new List<(int Id, string? ShipmentNumber)>(); |
| | 0 | 1322 | | for (int i = 0; i < numbers.Count; i += PrefixBatchSize) |
| | | 1323 | | { |
| | 0 | 1324 | | var batch = numbers.Skip(i).Take(PrefixBatchSize).Select(n => n + "-").ToList(); |
| | 0 | 1325 | | var batchResults = await GetOrdersByShipmentNumberPrefixesAsync(batch, ozonClientId); |
| | 0 | 1326 | | allResults.AddRange(batchResults); |
| | | 1327 | | } |
| | 0 | 1328 | | return allResults; |
| | 0 | 1329 | | } |
| | | 1330 | | |
| | | 1331 | | private async Task<List<(int Id, string? ShipmentNumber)>> GetOrdersByShipmentNumberPrefixesAsync(List<string> p |
| | | 1332 | | { |
| | 0 | 1333 | | if (prefixes.Count == 0 || ozonClientId <= 0) |
| | 0 | 1334 | | return new List<(int Id, string? ShipmentNumber)>(); |
| | | 1335 | | |
| | 0 | 1336 | | var parameter = Expression.Parameter(typeof(Order), "o"); |
| | 0 | 1337 | | Expression? body = null; |
| | | 1338 | | |
| | 0 | 1339 | | foreach (var prefix in prefixes) |
| | | 1340 | | { |
| | 0 | 1341 | | var shipmentNumberProp = Expression.Property(parameter, nameof(Order.ShipmentNumber)); |
| | 0 | 1342 | | var startsWithCall = Expression.Call( |
| | 0 | 1343 | | shipmentNumberProp, |
| | 0 | 1344 | | nameof(string.StartsWith), |
| | 0 | 1345 | | Type.EmptyTypes, |
| | 0 | 1346 | | Expression.Constant(prefix)); |
| | | 1347 | | |
| | 0 | 1348 | | var notNullCheck = Expression.NotEqual( |
| | 0 | 1349 | | shipmentNumberProp, |
| | 0 | 1350 | | Expression.Constant(null, typeof(string))); |
| | | 1351 | | |
| | 0 | 1352 | | var condition = Expression.AndAlso(notNullCheck, startsWithCall); |
| | 0 | 1353 | | body = body == null ? condition : Expression.OrElse(body, condition); |
| | | 1354 | | } |
| | | 1355 | | |
| | 0 | 1356 | | var predicate = Expression.Lambda<Func<Order, bool>>(body!, parameter); |
| | | 1357 | | |
| | 0 | 1358 | | var items = await _context.Orders |
| | 0 | 1359 | | .AsNoTracking() |
| | 0 | 1360 | | .Where(o => o.OrderArchive == null && o.OzonClientId == ozonClientId) |
| | 0 | 1361 | | .Where(predicate) |
| | 0 | 1362 | | .Select(o => new { o.Id, o.ShipmentNumber }) |
| | 0 | 1363 | | .ToListAsync(); |
| | | 1364 | | |
| | 0 | 1365 | | return items.Select(x => (x.Id, x.ShipmentNumber)).ToList(); |
| | 0 | 1366 | | } |
| | | 1367 | | |
| | | 1368 | | private async Task<List<(int Id, string? ShipmentNumber)>> GetOrdersByShipmentNumberPrefixesAsync(List<string> p |
| | | 1369 | | { |
| | 4 | 1370 | | if (prefixes.Count == 0) |
| | 0 | 1371 | | return new List<(int Id, string? ShipmentNumber)>(); |
| | | 1372 | | |
| | 4 | 1373 | | var parameter = Expression.Parameter(typeof(Order), "o"); |
| | 4 | 1374 | | Expression? body = null; |
| | | 1375 | | |
| | 16 | 1376 | | foreach (var prefix in prefixes) |
| | | 1377 | | { |
| | 4 | 1378 | | var shipmentNumberProp = Expression.Property(parameter, nameof(Order.ShipmentNumber)); |
| | 4 | 1379 | | var startsWithCall = Expression.Call( |
| | 4 | 1380 | | shipmentNumberProp, |
| | 4 | 1381 | | nameof(string.StartsWith), |
| | 4 | 1382 | | Type.EmptyTypes, |
| | 4 | 1383 | | Expression.Constant(prefix)); |
| | | 1384 | | |
| | 4 | 1385 | | var notNullCheck = Expression.NotEqual( |
| | 4 | 1386 | | shipmentNumberProp, |
| | 4 | 1387 | | Expression.Constant(null, typeof(string))); |
| | | 1388 | | |
| | 4 | 1389 | | var condition = Expression.AndAlso(notNullCheck, startsWithCall); |
| | 4 | 1390 | | body = body == null ? condition : Expression.OrElse(body, condition); |
| | | 1391 | | } |
| | | 1392 | | |
| | 4 | 1393 | | var predicate = Expression.Lambda<Func<Order, bool>>(body!, parameter); |
| | | 1394 | | |
| | 4 | 1395 | | var items = await _context.Orders |
| | 4 | 1396 | | .AsNoTracking() |
| | 4 | 1397 | | .Where(o => o.OrderArchive == null) |
| | 4 | 1398 | | .Where(predicate) |
| | 4 | 1399 | | .Select(o => new { o.Id, o.ShipmentNumber }) |
| | 4 | 1400 | | .ToListAsync(); |
| | | 1401 | | |
| | 4 | 1402 | | return items.Select(x => (x.Id, x.ShipmentNumber)).ToList(); |
| | 4 | 1403 | | } |
| | | 1404 | | |
| | | 1405 | | /// <summary> |
| | | 1406 | | /// Получить все заказы по Ozon SKU (FBS) с учетом клиента |
| | | 1407 | | /// </summary> |
| | | 1408 | | public async Task<List<Order>> GetOrdersBySkuAsync(string sku, int clientId) |
| | | 1409 | | { |
| | 0 | 1410 | | if (string.IsNullOrEmpty(sku) || clientId <= 0) |
| | 0 | 1411 | | return new List<Order>(); |
| | | 1412 | | |
| | 0 | 1413 | | return await _context.Orders |
| | 0 | 1414 | | .AsNoTracking() |
| | 0 | 1415 | | .Where(o => o.OrderArchive == null && o.OzonClientId == clientId) // Только активные заказы конкретного |
| | 0 | 1416 | | .Include(o => o.OzonClient) |
| | 0 | 1417 | | .Include(o => o.AppStatus) |
| | 0 | 1418 | | .Include(o => o.ClientStatus) |
| | 0 | 1419 | | .Include(o => o.ProductInfo) |
| | 0 | 1420 | | .Where(o => o.ProductInfo != null && o.ProductInfo.FbsOzonSkuId == sku) |
| | 0 | 1421 | | .ToListAsync(); |
| | 0 | 1422 | | } |
| | | 1423 | | } |
| | | 1424 | | |
| | | 1425 | | /// <summary>Лёгкая проекция заказа для отображения в результатах сопоставления (импорт выдачи Ozon и т.п.).</summar |
| | | 1426 | | public sealed class OrderHandoverMatchInfo |
| | | 1427 | | { |
| | | 1428 | | public int Id { get; set; } |
| | | 1429 | | public string? ShipmentNumber { get; set; } |
| | | 1430 | | public string? Article { get; set; } |
| | | 1431 | | public string? ClientName { get; set; } |
| | | 1432 | | public string? ClientStatusName { get; set; } |
| | | 1433 | | public string? ClientStatusColor { get; set; } |
| | | 1434 | | public string? AppStatusName { get; set; } |
| | | 1435 | | public string? AppStatusColor { get; set; } |
| | | 1436 | | } |
| | | 1437 | | } |