| | | 1 | | using Microsoft.Extensions.Http; |
| | | 2 | | using Newtonsoft.Json.Linq; |
| | | 3 | | using Services.ApiServices.OzonApi.Filters; |
| | | 4 | | using Services.LabelServices; |
| | | 5 | | using System.Collections.Concurrent; |
| | | 6 | | using SlqStudio.Application.Services.EmailService; |
| | | 7 | | |
| | | 8 | | namespace Services.ApiServices.OzonApi |
| | | 9 | | { |
| | | 10 | | public class OzonJsonDataBuilder |
| | | 11 | | { |
| | | 12 | | private readonly IHttpClientFactory _httpClientFactory; |
| | | 13 | | private readonly IEmailService? _emailService; |
| | | 14 | | private OzonApiDataManager _apiDataManager = null!; |
| | | 15 | | |
| | | 16 | | // Rate limiting: минимальная задержка между API запросами (мс) |
| | | 17 | | private const int MinDelayBetweenRequests = 100; |
| | | 18 | | // Максимальное количество параллельных запросов |
| | | 19 | | private const int MaxParallelRequests = 5; |
| | | 20 | | |
| | 24 | 21 | | public OzonJsonDataBuilder(IHttpClientFactory httpClientFactory, IEmailService? emailService) |
| | | 22 | | { |
| | 24 | 23 | | _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory)); |
| | 24 | 24 | | _emailService = emailService; |
| | 24 | 25 | | } |
| | | 26 | | |
| | | 27 | | public void Init(string clientId, string apiKey) |
| | | 28 | | { |
| | 16 | 29 | | _apiDataManager = new OzonApiDataManager(_httpClientFactory, _emailService, clientId, apiKey); |
| | 16 | 30 | | } |
| | | 31 | | |
| | | 32 | | public virtual void SetClient(string clientId, string apiKey) |
| | | 33 | | { |
| | 0 | 34 | | _apiDataManager = _apiDataManager.SetClient(clientId, apiKey); |
| | 0 | 35 | | } |
| | | 36 | | |
| | | 37 | | /// <summary>Батч-запрос статусов отправлений для клиента, установленного через <see cref="SetClient"/>.</summar |
| | | 38 | | public Task<Dictionary<string, (bool Success, string Status)>> GetProductStatusBatch( |
| | | 39 | | IReadOnlyCollection<string> productNumbers, int maxParallelism = MaxParallelRequests) => |
| | 0 | 40 | | _apiDataManager.GetProductStatusBatch(productNumbers, maxParallelism); |
| | | 41 | | |
| | | 42 | | public Task<Filters.OzonCancelReasonCatalogResponse> GetFbsCancelReasonCatalogAsync() => |
| | 4 | 43 | | _apiDataManager.GetFbsCancelReasonCatalogAsync(); |
| | | 44 | | |
| | | 45 | | public async Task<JArray> BuildData(DateTime start, DateTime end) |
| | | 46 | | { |
| | | 47 | | const int batchSize = 500; |
| | | 48 | | |
| | | 49 | | // ШАГ 1: Получаем код отчета и ждем его готовности с polling |
| | 0 | 50 | | var orderCode = await _apiDataManager.GetReportCode(start, end); |
| | 0 | 51 | | var orderFile = await _apiDataManager.WaitForReportReady(orderCode); |
| | 0 | 52 | | var oredersContent = await _apiDataManager.ReadFileByUrl(orderFile); |
| | | 53 | | |
| | 0 | 54 | | if (oredersContent == null || !oredersContent.Any()) |
| | | 55 | | { |
| | 0 | 56 | | return new JArray(); |
| | | 57 | | } |
| | | 58 | | |
| | | 59 | | // Извлекаем данные из заказов |
| | 0 | 60 | | var articles = new List<string>(); |
| | 0 | 61 | | var ozonIds = new List<string>(); |
| | 0 | 62 | | var productNumbers = new List<string>(); |
| | | 63 | | |
| | 0 | 64 | | foreach (var order in oredersContent) |
| | | 65 | | { |
| | 0 | 66 | | articles.Add(order["Артикул"]?.ToString() ?? string.Empty); |
| | 0 | 67 | | ozonIds.Add(order["SKU"]?.ToString() ?? string.Empty); |
| | 0 | 68 | | productNumbers.Add(order["Номер отправления"]?.ToString() ?? string.Empty); |
| | | 69 | | } |
| | | 70 | | |
| | | 71 | | // ШАГ 2: Получаем данные о продуктах (параллельно по батчам) |
| | 0 | 72 | | var productsContent = await GetProductsContentParallel(articles, ozonIds, batchSize); |
| | 0 | 73 | | NormalizeProductReportArticleColumn(productsContent); |
| | | 74 | | |
| | | 75 | | // Извлекаем данные из продуктов |
| | 0 | 76 | | var newArticles = new List<string>(); |
| | 0 | 77 | | var ozonProductIds = new List<string>(); |
| | 0 | 78 | | var fbsOzonSkuIds = new List<string>(); |
| | | 79 | | |
| | 0 | 80 | | foreach (var order in productsContent) |
| | | 81 | | { |
| | 0 | 82 | | newArticles.Add(order["Артикул"]?.ToString() ?? string.Empty); |
| | 0 | 83 | | ozonProductIds.Add(order["Ozon Product ID"]?.ToString() ?? string.Empty); |
| | 0 | 84 | | fbsOzonSkuIds.Add(order["SKU"]?.ToString() ?? string.Empty); |
| | | 85 | | } |
| | | 86 | | |
| | | 87 | | // ШАГ 3: Параллельно получаем цены, склады и города |
| | 0 | 88 | | var pricesTask = GetProductPricesParallel(newArticles, ozonProductIds, batchSize); |
| | 0 | 89 | | var warehousesTask = GetProductWarehousesParallel(fbsOzonSkuIds, batchSize); |
| | 0 | 90 | | var warehousesAndCitysTask = GetProductWarehousesAndCitysParallel(productNumbers.ToArray()); |
| | 0 | 91 | | var primaryImagesTask = GetProductPrimaryImagesParallel(ozonProductIds, batchSize); |
| | | 92 | | |
| | | 93 | | // Ожидаем завершения всех параллельных задач |
| | | 94 | | try |
| | | 95 | | { |
| | 0 | 96 | | await Task.WhenAll(pricesTask, warehousesTask, warehousesAndCitysTask, primaryImagesTask); |
| | | 97 | | } |
| | | 98 | | finally |
| | | 99 | | { |
| | | 100 | | try |
| | | 101 | | { |
| | 0 | 102 | | await primaryImagesTask; |
| | 0 | 103 | | } |
| | 0 | 104 | | catch |
| | | 105 | | { |
| | | 106 | | // Игнорируем ошибку картинок при падении основных задач |
| | 0 | 107 | | } |
| | | 108 | | } |
| | | 109 | | |
| | 0 | 110 | | var productPrices = await pricesTask; |
| | 0 | 111 | | var allProductWarehouses = await warehousesTask; |
| | 0 | 112 | | var allProductWarehousesAndCitys = await warehousesAndCitysTask; |
| | 0 | 113 | | var primaryImagesByProductId = await primaryImagesTask; |
| | | 114 | | |
| | | 115 | | // ШАГ 4: Собираем все данные |
| | 0 | 116 | | var collectDataResult = new JArray(); |
| | | 117 | | try |
| | | 118 | | { |
| | 0 | 119 | | collectDataResult = await CollectData(oredersContent, productsContent, productPrices, |
| | 0 | 120 | | allProductWarehouses, allProductWarehousesAndCitys, primaryImagesByProductId); |
| | 0 | 121 | | } |
| | 0 | 122 | | catch (Exception ex) |
| | | 123 | | { |
| | 0 | 124 | | Console.WriteLine($"Ошибка при сборке данных: {ex.Message}"); |
| | 0 | 125 | | } |
| | | 126 | | |
| | 0 | 127 | | return collectDataResult; |
| | 0 | 128 | | } |
| | | 129 | | |
| | | 130 | | /// <summary> |
| | | 131 | | /// Получает primary_image для товаров по product_id через Ozon Seller API. |
| | | 132 | | /// Используется для последующего заполнения Product.ImageUrl в OrderCaster без обращения к API. |
| | | 133 | | /// </summary> |
| | | 134 | | internal async Task<Dictionary<string, string?>> GetProductPrimaryImagesParallel(List<string> ozonProductIds, |
| | | 135 | | int batchSize) |
| | | 136 | | { |
| | 3 | 137 | | var cleanedIds = ozonProductIds |
| | 4 | 138 | | .Where(id => !string.IsNullOrWhiteSpace(id)) |
| | 4 | 139 | | .Select(id => id.Trim().TrimStart('\'')) |
| | 3 | 140 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 3 | 141 | | .ToList(); |
| | | 142 | | |
| | 3 | 143 | | if (cleanedIds.Count == 0) |
| | | 144 | | { |
| | 0 | 145 | | return new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase); |
| | | 146 | | } |
| | | 147 | | |
| | 3 | 148 | | var imagesByProductId = new ConcurrentDictionary<string, string?>(StringComparer.OrdinalIgnoreCase); |
| | 3 | 149 | | int productBatches = GetBathesCount(batchSize, cleanedIds.Count); |
| | 3 | 150 | | var semaphore = new SemaphoreSlim(MaxParallelRequests); |
| | | 151 | | |
| | | 152 | | try |
| | | 153 | | { |
| | 3 | 154 | | var tasks = Enumerable.Range(0, productBatches).Select(async i => |
| | 3 | 155 | | { |
| | 3 | 156 | | await semaphore.WaitAsync(); |
| | 3 | 157 | | try |
| | 3 | 158 | | { |
| | 3 | 159 | | var productIdsBatch = cleanedIds.Skip(i * batchSize).Take(batchSize).ToArray(); |
| | 3 | 160 | | if (productIdsBatch.Length == 0) |
| | 3 | 161 | | { |
| | 0 | 162 | | return; |
| | 3 | 163 | | } |
| | 3 | 164 | | |
| | 3 | 165 | | var limit = Math.Min(productIdsBatch.Length, 1000); |
| | 3 | 166 | | |
| | 3 | 167 | | var response = await _apiDataManager.GetProductAttributesAsync( |
| | 3 | 168 | | productIds: productIdsBatch, |
| | 3 | 169 | | offerIds: null, |
| | 3 | 170 | | skus: null, |
| | 3 | 171 | | visibility: "ALL", |
| | 3 | 172 | | lastId: "", |
| | 3 | 173 | | limit: limit, |
| | 3 | 174 | | sortBy: "id", |
| | 3 | 175 | | sortDir: "ASC") |
| | 3 | 176 | | .ConfigureAwait(false); |
| | 3 | 177 | | |
| | 2 | 178 | | if (response?.Result == null) |
| | 3 | 179 | | { |
| | 0 | 180 | | return; |
| | 3 | 181 | | } |
| | 3 | 182 | | |
| | 6 | 183 | | foreach (var item in response.Result) |
| | 3 | 184 | | { |
| | 1 | 185 | | var key = item?.Id.ToString(); |
| | 1 | 186 | | if (string.IsNullOrWhiteSpace(key)) |
| | 3 | 187 | | { |
| | 3 | 188 | | continue; |
| | 3 | 189 | | } |
| | 3 | 190 | | |
| | 3 | 191 | | // primary_image может быть пустым — это нормальная ситуация. |
| | 1 | 192 | | imagesByProductId.AddOrUpdate( |
| | 1 | 193 | | key, |
| | 1 | 194 | | item?.PrimaryImage, |
| | 1 | 195 | | (_, existing) => |
| | 1 | 196 | | { |
| | 1 | 197 | | // Если уже есть непустое значение — не перетираем. |
| | 0 | 198 | | if (!string.IsNullOrWhiteSpace(existing)) |
| | 1 | 199 | | { |
| | 0 | 200 | | return existing; |
| | 1 | 201 | | } |
| | 1 | 202 | | |
| | 1 | 203 | | // Если новое значение непустое — обновляем. |
| | 0 | 204 | | return string.IsNullOrWhiteSpace(item?.PrimaryImage) ? existing : item?.PrimaryImage |
| | 1 | 205 | | }); |
| | 3 | 206 | | } |
| | 2 | 207 | | } |
| | 1 | 208 | | catch (Exception ex) |
| | 3 | 209 | | { |
| | 3 | 210 | | // Загрузка изображений вспомогательная и не должна приводить к сбою остальных батчей |
| | 3 | 211 | | // или выбрасывать исключение в фоновой задаче. |
| | 1 | 212 | | Console.WriteLine($"GetProductPrimaryImagesParallel: ошибка загрузки картинок для батча {i}: {ex |
| | 1 | 213 | | } |
| | 3 | 214 | | finally |
| | 3 | 215 | | { |
| | 3 | 216 | | semaphore.Release(); |
| | 3 | 217 | | await Task.Delay(MinDelayBetweenRequests); |
| | 3 | 218 | | } |
| | 3 | 219 | | }).ToArray(); |
| | | 220 | | |
| | 3 | 221 | | await Task.WhenAll(tasks); |
| | 3 | 222 | | } |
| | 0 | 223 | | catch (Exception ex) |
| | | 224 | | { |
| | | 225 | | // Гарантируем, что метод никогда не вернет faulted Task, вызывающий UnobservedTaskException на сборщике |
| | 0 | 226 | | Console.WriteLine($"GetProductPrimaryImagesParallel: ошибка параллельной загрузки картинок: {ex.Message} |
| | 0 | 227 | | } |
| | | 228 | | |
| | 5 | 229 | | return imagesByProductId.ToDictionary(kvp => kvp.Key, kvp => kvp.Value, StringComparer.OrdinalIgnoreCase); |
| | 3 | 230 | | } |
| | | 231 | | |
| | | 232 | | /// <summary> |
| | | 233 | | /// Получает данные о продуктах параллельно по батчам |
| | | 234 | | /// </summary> |
| | | 235 | | private async Task<JArray> GetProductsContentParallel(List<string> articles, List<string> ozonIds, int batchSize |
| | | 236 | | { |
| | 0 | 237 | | var productsContent = new ConcurrentBag<JToken>(); |
| | 0 | 238 | | int productBatches = GetBathesCount(batchSize, articles.Count); |
| | 0 | 239 | | var semaphore = new SemaphoreSlim(MaxParallelRequests); |
| | | 240 | | |
| | 0 | 241 | | var tasks = Enumerable.Range(0, productBatches).Select(async i => |
| | 0 | 242 | | { |
| | 0 | 243 | | await semaphore.WaitAsync(); |
| | 0 | 244 | | try |
| | 0 | 245 | | { |
| | 0 | 246 | | var articlesBatch = articles.Skip(i * batchSize).Take(batchSize).ToArray(); |
| | 0 | 247 | | var ozonIdsBatch = ozonIds.Skip(i * batchSize).Take(batchSize).ToArray(); |
| | 0 | 248 | | |
| | 0 | 249 | | var productsCode = await _apiDataManager.GetProductCode(articlesBatch, ozonIdsBatch); |
| | 0 | 250 | | var productsFile = await _apiDataManager.WaitForReportReady(productsCode); |
| | 0 | 251 | | var productContent = await _apiDataManager.ReadFileByUrl(productsFile); |
| | 0 | 252 | | |
| | 0 | 253 | | foreach (JToken product in productContent) |
| | 0 | 254 | | { |
| | 0 | 255 | | productsContent.Add(product); |
| | 0 | 256 | | } |
| | 0 | 257 | | } |
| | 0 | 258 | | finally |
| | 0 | 259 | | { |
| | 0 | 260 | | semaphore.Release(); |
| | 0 | 261 | | await Task.Delay(MinDelayBetweenRequests); // Rate limiting |
| | 0 | 262 | | } |
| | 0 | 263 | | }); |
| | | 264 | | |
| | 0 | 265 | | await Task.WhenAll(tasks); |
| | 0 | 266 | | return new JArray(productsContent); |
| | 0 | 267 | | } |
| | | 268 | | |
| | | 269 | | /// <summary> |
| | | 270 | | /// Получает цены продуктов параллельно по батчам |
| | | 271 | | /// </summary> |
| | | 272 | | private async Task<JObject> GetProductPricesParallel(List<string> newArticles, List<string> ozonProductIds, int |
| | | 273 | | { |
| | 0 | 274 | | var productPrices = new JObject(); |
| | 0 | 275 | | var lockObj = new object(); |
| | 0 | 276 | | int pricesBatches = GetBathesCount(batchSize, newArticles.Count); |
| | 0 | 277 | | var semaphore = new SemaphoreSlim(MaxParallelRequests); |
| | | 278 | | |
| | 0 | 279 | | var tasks = Enumerable.Range(0, pricesBatches).Select(async j => |
| | 0 | 280 | | { |
| | 0 | 281 | | await semaphore.WaitAsync(); |
| | 0 | 282 | | try |
| | 0 | 283 | | { |
| | 0 | 284 | | var newArticlesBatch = newArticles.Skip(j * batchSize).Take(batchSize).ToArray(); |
| | 0 | 285 | | var ozonProductBatch = ozonProductIds.Skip(j * batchSize).Take(batchSize).ToArray(); |
| | 0 | 286 | | |
| | 0 | 287 | | var productPrice = await _apiDataManager.GetProductPrices(newArticlesBatch, ozonProductBatch); |
| | 0 | 288 | | |
| | 0 | 289 | | lock (lockObj) |
| | 0 | 290 | | { |
| | 0 | 291 | | productPrices.Merge(productPrice, new JsonMergeSettings |
| | 0 | 292 | | { |
| | 0 | 293 | | MergeArrayHandling = MergeArrayHandling.Union |
| | 0 | 294 | | }); |
| | 0 | 295 | | } |
| | 0 | 296 | | } |
| | 0 | 297 | | finally |
| | 0 | 298 | | { |
| | 0 | 299 | | semaphore.Release(); |
| | 0 | 300 | | await Task.Delay(MinDelayBetweenRequests); |
| | 0 | 301 | | } |
| | 0 | 302 | | }); |
| | | 303 | | |
| | 0 | 304 | | await Task.WhenAll(tasks); |
| | 0 | 305 | | return productPrices; |
| | 0 | 306 | | } |
| | | 307 | | |
| | | 308 | | /// <summary> |
| | | 309 | | /// Получает данные о складах параллельно по батчам |
| | | 310 | | /// </summary> |
| | | 311 | | private async Task<JObject> GetProductWarehousesParallel(List<string> fbsOzonSkuIds, int batchSize) |
| | | 312 | | { |
| | 0 | 313 | | var allProductWarehouses = new JObject(); |
| | 0 | 314 | | var lockObj = new object(); |
| | 0 | 315 | | int productWarehousesBatches = GetBathesCount(batchSize, fbsOzonSkuIds.Count); |
| | 0 | 316 | | var semaphore = new SemaphoreSlim(MaxParallelRequests); |
| | | 317 | | |
| | 0 | 318 | | var tasks = Enumerable.Range(0, productWarehousesBatches).Select(async k => |
| | 0 | 319 | | { |
| | 0 | 320 | | await semaphore.WaitAsync(); |
| | 0 | 321 | | try |
| | 0 | 322 | | { |
| | 0 | 323 | | var currentBatch = fbsOzonSkuIds.Skip(k * batchSize).Take(batchSize).ToArray(); |
| | 0 | 324 | | var productWarehouses = await _apiDataManager.GetProductWarehouses(currentBatch, currentBatch); |
| | 0 | 325 | | |
| | 0 | 326 | | lock (lockObj) |
| | 0 | 327 | | { |
| | 0 | 328 | | allProductWarehouses.Merge(productWarehouses, new JsonMergeSettings |
| | 0 | 329 | | { |
| | 0 | 330 | | MergeArrayHandling = MergeArrayHandling.Union |
| | 0 | 331 | | }); |
| | 0 | 332 | | } |
| | 0 | 333 | | } |
| | 0 | 334 | | finally |
| | 0 | 335 | | { |
| | 0 | 336 | | semaphore.Release(); |
| | 0 | 337 | | await Task.Delay(MinDelayBetweenRequests); |
| | 0 | 338 | | } |
| | 0 | 339 | | }); |
| | | 340 | | |
| | 0 | 341 | | await Task.WhenAll(tasks); |
| | 0 | 342 | | return allProductWarehouses; |
| | 0 | 343 | | } |
| | | 344 | | |
| | | 345 | | /// <summary> |
| | | 346 | | /// Получает данные о складах и городах параллельно (это самый медленный запрос - по одному номеру) |
| | | 347 | | /// </summary> |
| | | 348 | | private async Task<JArray> GetProductWarehousesAndCitysParallel(string[] productNumbers) |
| | | 349 | | { |
| | 0 | 350 | | var allProductWarehousesAndCitys = new ConcurrentBag<JToken>(); |
| | | 351 | | |
| | | 352 | | // Используем batch-метод из OzonApiDataManager |
| | 0 | 353 | | var batchResults = await _apiDataManager.GetProductWarehousAndCityBatch(productNumbers, MaxParallelRequests |
| | | 354 | | |
| | 0 | 355 | | foreach (var kvp in batchResults) |
| | | 356 | | { |
| | 0 | 357 | | var productWarehousAndCity = kvp.Value; |
| | 0 | 358 | | if (productWarehousAndCity != null) |
| | | 359 | | { |
| | 0 | 360 | | var properties = productWarehousAndCity.Properties(); |
| | 0 | 361 | | foreach (var property in properties) |
| | | 362 | | { |
| | 0 | 363 | | allProductWarehousesAndCitys.Add(property.Value); |
| | | 364 | | } |
| | | 365 | | } |
| | | 366 | | } |
| | | 367 | | |
| | 0 | 368 | | return new JArray(allProductWarehousesAndCitys); |
| | 0 | 369 | | } |
| | | 370 | | |
| | | 371 | | private int GetBathesCount(int batchSize, int skuCount) |
| | | 372 | | { |
| | 3 | 373 | | return (int)Math.Ceiling((double)skuCount / batchSize); |
| | | 374 | | } |
| | | 375 | | |
| | | 376 | | internal static void NormalizeProductReportArticleColumn(JArray productsContent) |
| | | 377 | | { |
| | 4 | 378 | | foreach (var product in productsContent.OfType<JObject>()) |
| | | 379 | | { |
| | 1 | 380 | | if (!string.IsNullOrWhiteSpace(product["Артикул"]?.ToString())) |
| | | 381 | | continue; |
| | | 382 | | |
| | 1 | 383 | | var article = product.Properties() |
| | 1 | 384 | | .FirstOrDefault(property => IsOzonArticleColumn(property.Name))? |
| | 1 | 385 | | .Value? |
| | 1 | 386 | | .ToString(); |
| | 1 | 387 | | if (!string.IsNullOrWhiteSpace(article)) |
| | 1 | 388 | | product["Артикул"] = article; |
| | | 389 | | } |
| | 1 | 390 | | } |
| | | 391 | | |
| | | 392 | | private static bool IsOzonArticleColumn(string columnName) |
| | | 393 | | { |
| | 1 | 394 | | var normalized = columnName.Trim(); |
| | 1 | 395 | | if (normalized.StartsWith("{{{", StringComparison.Ordinal) && |
| | 1 | 396 | | normalized.EndsWith("}}}", StringComparison.Ordinal)) |
| | | 397 | | { |
| | 1 | 398 | | normalized = normalized[3..^3]; |
| | | 399 | | } |
| | | 400 | | |
| | 1 | 401 | | var formatSeparator = normalized.IndexOf('|'); |
| | 1 | 402 | | if (formatSeparator >= 0) |
| | 1 | 403 | | normalized = normalized[..formatSeparator]; |
| | | 404 | | |
| | 1 | 405 | | return string.Equals(normalized, "Артикул", StringComparison.OrdinalIgnoreCase); |
| | | 406 | | } |
| | | 407 | | |
| | | 408 | | private async Task<JArray> CollectData(JArray oredersContent, |
| | | 409 | | JArray productsContent, |
| | | 410 | | JObject productPrices, |
| | | 411 | | JObject allProductWarehouses, |
| | | 412 | | JArray allProductWarehousesAndCitys, |
| | | 413 | | Dictionary<string, string?> primaryImagesByProductId) |
| | | 414 | | { |
| | 0 | 415 | | await Task.CompletedTask; |
| | | 416 | | // Создаем словари для быстрого поиска O(1) вместо O(n) |
| | 0 | 417 | | var productsByArticle = new Dictionary<string, JToken>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 418 | | foreach (var product in productsContent) |
| | | 419 | | { |
| | 0 | 420 | | var article = product["Артикул"]?.ToString()?.TrimStart('\''); |
| | 0 | 421 | | if (!string.IsNullOrEmpty(article) && !productsByArticle.ContainsKey(article)) |
| | | 422 | | { |
| | 0 | 423 | | productsByArticle[article] = product; |
| | | 424 | | } |
| | | 425 | | } |
| | | 426 | | |
| | 0 | 427 | | var pricesByOfferId = new Dictionary<string, JToken>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 428 | | if (productPrices?["items"] is JArray priceItems) |
| | | 429 | | { |
| | 0 | 430 | | foreach (var item in priceItems) |
| | | 431 | | { |
| | 0 | 432 | | var offerId = item?["offer_id"]?.ToString(); |
| | 0 | 433 | | if (!string.IsNullOrEmpty(offerId) && !pricesByOfferId.ContainsKey(offerId)) |
| | | 434 | | { |
| | 0 | 435 | | pricesByOfferId[offerId] = item!; |
| | | 436 | | } |
| | | 437 | | } |
| | | 438 | | } |
| | | 439 | | |
| | 0 | 440 | | var warehousesBySku = new Dictionary<string, JToken>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 441 | | if (allProductWarehouses?["result"] is JArray warehouseItems) |
| | | 442 | | { |
| | 0 | 443 | | foreach (var item in warehouseItems) |
| | | 444 | | { |
| | 0 | 445 | | var sku = item?["sku"]?.ToString(); |
| | 0 | 446 | | if (!string.IsNullOrEmpty(sku)) |
| | | 447 | | { |
| | 0 | 448 | | warehousesBySku[sku] = item!; |
| | | 449 | | } |
| | | 450 | | } |
| | | 451 | | } |
| | | 452 | | |
| | 0 | 453 | | var warehousesAndCitysByNumber = new Dictionary<string, JToken>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 454 | | foreach (var item in allProductWarehousesAndCitys) |
| | | 455 | | { |
| | 0 | 456 | | var postingNumber = item?["posting_number"]?.ToString(); |
| | 0 | 457 | | if (!string.IsNullOrEmpty(postingNumber) && !warehousesAndCitysByNumber.ContainsKey(postingNumber)) |
| | | 458 | | { |
| | 0 | 459 | | warehousesAndCitysByNumber[postingNumber] = item!; |
| | | 460 | | } |
| | | 461 | | } |
| | | 462 | | |
| | | 463 | | // Теперь обрабатываем заказы с использованием словарей |
| | 0 | 464 | | foreach (var order in oredersContent) |
| | | 465 | | { |
| | 0 | 466 | | var article = order["Артикул"]?.ToString()?.TrimStart('\''); |
| | 0 | 467 | | var shipmentNumber = order["Номер отправления"]?.ToString(); |
| | | 468 | | |
| | | 469 | | // Находим продукт по артикулу |
| | 0 | 470 | | productsByArticle.TryGetValue(article ?? string.Empty, out var productWithArticleSource); |
| | | 471 | | |
| | | 472 | | // У каждого заказа должна быть своя копия объекта продукта. |
| | | 473 | | // Иначе один и тот же JToken перепривязывается к разным parent и теряет изменения. |
| | 0 | 474 | | var productWithArticle = productWithArticleSource?.DeepClone(); |
| | | 475 | | |
| | | 476 | | // Обогащаем token productWithArticle значением primary_image (для OrderCaster) |
| | 0 | 477 | | if (productWithArticle != null) |
| | | 478 | | { |
| | 0 | 479 | | if (productWithArticle is JObject productObj) |
| | | 480 | | { |
| | 0 | 481 | | var ozonProductId = productObj["Ozon Product ID"]?.ToString()?.Trim().TrimStart('\'') ?? ""; |
| | | 482 | | // Кладём поле всегда, даже если ключ не найден или значение пустое. |
| | | 483 | | // Это позволяет быстро дебажить факт вызова и сопоставления. |
| | 0 | 484 | | var primaryImage = primaryImagesByProductId.TryGetValue(ozonProductId, out var img) |
| | 0 | 485 | | ? img |
| | 0 | 486 | | : ""; |
| | 0 | 487 | | productObj["primary_image"] = primaryImage ?? ""; |
| | | 488 | | } |
| | | 489 | | } |
| | | 490 | | |
| | 0 | 491 | | order["productWithArticle"] = productWithArticle; |
| | | 492 | | |
| | | 493 | | // Находим цены по артикулу |
| | 0 | 494 | | pricesByOfferId.TryGetValue(article ?? string.Empty, out var productPricesWithArticle); |
| | 0 | 495 | | order["productPricesWithArticle"] = productPricesWithArticle; |
| | | 496 | | |
| | | 497 | | // Находим склады по SKU продукта |
| | 0 | 498 | | var productSku = productWithArticle?["SKU"]?.ToString(); |
| | 0 | 499 | | warehousesBySku.TryGetValue(productSku ?? string.Empty, out var productWarehousesWithArticle); |
| | 0 | 500 | | order["productWarehousesWithArticle"] = productWarehousesWithArticle; |
| | | 501 | | |
| | | 502 | | // Находим склады и города по номеру отправления |
| | 0 | 503 | | warehousesAndCitysByNumber.TryGetValue(shipmentNumber ?? string.Empty, out var productWarehousesAndCitys |
| | 0 | 504 | | order["productWarehousesAndCitysWithNumber"] = productWarehousesAndCitysWithNumber; |
| | | 505 | | } |
| | | 506 | | |
| | 0 | 507 | | return oredersContent; |
| | 0 | 508 | | } |
| | | 509 | | |
| | | 510 | | public async Task<bool> GetTestReques(string clientId, string apiKey) |
| | | 511 | | { |
| | 0 | 512 | | return await _apiDataManager.GetTestRequest(clientId, apiKey); |
| | 0 | 513 | | } |
| | | 514 | | |
| | | 515 | | /// <summary> |
| | | 516 | | /// PDF этикетки одного отправления: задание /v3/posting/fbs/package-label/create, опрос |
| | | 517 | | /// /v2/posting/fbs/package-label/get и скачивание file_url. Синхронный /v2/posting/fbs/package-label |
| | | 518 | | /// Ozon отключает 2 ноября 2026. |
| | | 519 | | /// </summary> |
| | | 520 | | public async Task<byte[]> GetOrderLabel(string shipmentNumber) |
| | | 521 | | { |
| | 0 | 522 | | var postings = new[] { shipmentNumber }; |
| | 0 | 523 | | var createResponse = await _apiDataManager.CreatePackageLabelTask(postings).ConfigureAwait(false); |
| | 0 | 524 | | var task = createResponse.PickTask() |
| | 0 | 525 | | ?? throw new Exception("Не удалось создать задание на формирование этикетки (пустой ответ)."); |
| | | 526 | | |
| | | 527 | | // file_url ведёт на файловое хранилище Ozon, а не на api-seller — берём клиент из фабрики |
| | | 528 | | // (создавать HttpClient вручную нельзя: сокеты не переиспользуются). |
| | 0 | 529 | | var httpClient = _httpClientFactory.CreateClient(OzonLabelPrintService.LabelDownloadHttpClientName); |
| | 0 | 530 | | return await PackageLabelPollingHelper.PollSingleTaskForBytesAsync( |
| | 0 | 531 | | id => _apiDataManager.GetPackageLabelFile(id), |
| | 0 | 532 | | url => httpClient.GetByteArrayAsync(url), |
| | 0 | 533 | | task.TaskId, |
| | 0 | 534 | | postings).ConfigureAwait(false); |
| | 0 | 535 | | } |
| | | 536 | | |
| | | 537 | | /// <summary> |
| | | 538 | | /// ScanIt отправления (/v3/posting/fbs/get). null — Ozon его ещё не присвоил |
| | | 539 | | /// (старый формат этикетки или отправление не собрано). |
| | | 540 | | /// </summary> |
| | | 541 | | public async Task<string?> GetPostingScanit(string postingNumber) |
| | | 542 | | { |
| | 0 | 543 | | var response = await _apiDataManager.GetProductWarehousAndCity(postingNumber).ConfigureAwait(false); |
| | 0 | 544 | | var scanit = response?["result"]?["scanit"]?.ToString(); |
| | 0 | 545 | | return string.IsNullOrWhiteSpace(scanit) ? null : scanit.Trim(); |
| | 0 | 546 | | } |
| | | 547 | | |
| | | 548 | | /// <summary> |
| | | 549 | | /// Создать задание на формирование этикеток для отправлений |
| | | 550 | | /// </summary> |
| | | 551 | | public async Task<PackageLabelCreateResponse> CreatePackageLabelTask(string[] postingNumbers) |
| | | 552 | | { |
| | 0 | 553 | | return await _apiDataManager.CreatePackageLabelTask(postingNumbers); |
| | 0 | 554 | | } |
| | | 555 | | |
| | | 556 | | /// <summary> |
| | | 557 | | /// Получить файл с этикетками по task_id |
| | | 558 | | /// </summary> |
| | | 559 | | public async Task<PackageLabelGetResponse> GetPackageLabelFile(long taskId) |
| | | 560 | | { |
| | 0 | 561 | | return await _apiDataManager.GetPackageLabelFile(taskId); |
| | 0 | 562 | | } |
| | | 563 | | |
| | | 564 | | public async Task<bool> CheckOrderForExistence(string article, string ozonProductId) |
| | | 565 | | { |
| | 0 | 566 | | return await _apiDataManager.CheckOrderForExistence([article], [ozonProductId]); |
| | 0 | 567 | | } |
| | | 568 | | |
| | | 569 | | public async Task<string> GetProductSatatus(string productNumber) |
| | | 570 | | { |
| | 0 | 571 | | return await _apiDataManager.GetProductSatatus(productNumber); |
| | 0 | 572 | | } |
| | | 573 | | |
| | | 574 | | public async Task<string> GetProductSubSatatus(string productNumber) |
| | | 575 | | { |
| | 0 | 576 | | return await _apiDataManager.GetProductSubSatatus(productNumber); |
| | 0 | 577 | | } |
| | | 578 | | |
| | | 579 | | public async Task<string> GetProductId(string productNumber) |
| | | 580 | | { |
| | 0 | 581 | | return await _apiDataManager.GetProductId(productNumber); |
| | 0 | 582 | | } |
| | | 583 | | |
| | | 584 | | public async Task<List<JObject>> GetProducts(string productNumber) |
| | | 585 | | { |
| | 0 | 586 | | return await _apiDataManager.GetProducts(productNumber); |
| | 0 | 587 | | } |
| | | 588 | | |
| | | 589 | | public Task<(List<JObject> Products, string? DeliveryMethodName, string? TplProvider)> |
| | | 590 | | GetPostingProductsWithDeliveryAsync(string postingNumber) |
| | | 591 | | { |
| | 0 | 592 | | return _apiDataManager.GetPostingProductsWithDeliveryAsync(postingNumber); |
| | | 593 | | } |
| | | 594 | | |
| | | 595 | | public Task<Dictionary<string, string>> GetPrimaryImagesBySkuAsync(long[] skus) |
| | | 596 | | { |
| | 0 | 597 | | return _apiDataManager.GetPrimaryImagesBySkuAsync(skus); |
| | | 598 | | } |
| | | 599 | | |
| | | 600 | | /// <summary> |
| | | 601 | | /// Обертка над OzonApiDataManager.ShipFbsPosting (собрать заказ /v4/posting/fbs/ship). |
| | | 602 | | /// </summary> |
| | | 603 | | public async Task<JObject> ShipFbsPosting(string postingNumber, List<FbsShipPackage> packages, |
| | | 604 | | bool withAdditionalData = true) |
| | | 605 | | { |
| | 0 | 606 | | return await _apiDataManager.ShipFbsPosting(postingNumber, packages, withAdditionalData); |
| | 0 | 607 | | } |
| | | 608 | | |
| | | 609 | | public async Task<AwaitingDeliveryResponse> SetAwaitingDelivery(string[] postingNumbers) |
| | | 610 | | { |
| | 0 | 611 | | return await _apiDataManager.SetAwaitingDelivery(postingNumbers); |
| | 0 | 612 | | } |
| | | 613 | | |
| | | 614 | | /// <summary> |
| | | 615 | | /// Загружает полные данные одного отправления по posting_number через Ozon API |
| | | 616 | | /// и собирает их в формат, совместимый с <see cref="CollectData"/> / OrderCaster.CastToModel. |
| | | 617 | | /// |
| | | 618 | | /// Используется обработчиком TYPE_NEW_POSTING для мгновенной загрузки заказа |
| | | 619 | | /// без ожидания периодического отчёта. |
| | | 620 | | /// |
| | | 621 | | /// Пайплайн повторяет оригинальный <see cref="BuildData"/>: |
| | | 622 | | /// 1. Данные отправления через /v3/posting/fbs/get |
| | | 623 | | /// 2. Отчёт по товарам через /v1/report/products/create (Barcode, Category, Volume) |
| | | 624 | | /// 3. Цены/комиссии через /v5/product/info/prices |
| | | 625 | | /// 4. Остатки по складам через /v2/product/info/stocks-by-warehouse/fbs |
| | | 626 | | /// 5. Картинки через /v4/product/info/attributes |
| | | 627 | | /// 6. Сборка через <see cref="CollectData"/> |
| | | 628 | | /// </summary> |
| | | 629 | | public virtual async Task<JArray> BuildDataForPosting(string postingNumber) |
| | | 630 | | { |
| | | 631 | | const int batchSize = 500; |
| | | 632 | | |
| | | 633 | | // ШАГ 1: Получаем полные данные отправления через /v3/posting/fbs/get |
| | 0 | 634 | | var postingResponse = await _apiDataManager.GetProductWarehousAndCity(postingNumber); |
| | 0 | 635 | | var postingResult = postingResponse?["result"]; |
| | | 636 | | |
| | 0 | 637 | | if (postingResult == null) |
| | 0 | 638 | | return new JArray(); |
| | | 639 | | |
| | 0 | 640 | | var products = postingResult["products"] as JArray; |
| | 0 | 641 | | if (products == null || !products.Any()) |
| | 0 | 642 | | return new JArray(); |
| | | 643 | | |
| | 0 | 644 | | var postingNum = postingResult["posting_number"]?.ToString() ?? postingNumber; |
| | 0 | 645 | | var status = postingResult["status"]?.ToString() ?? ""; |
| | 0 | 646 | | var humanStatus = Services.ParserServices.HelpDictEnum.OzonStatus.OrderStatuses |
| | 0 | 647 | | .TryGetValue(status, out var statusName) ? statusName : status; |
| | | 648 | | |
| | | 649 | | // Форматируем даты в ISO 8601 — culture-independent, |
| | | 650 | | // корректно парсятся CastToModel с любой локалью сервера (ru/en) |
| | 0 | 651 | | var inProcessAt = FormatJTokenDate(postingResult["in_process_at"]); |
| | 0 | 652 | | var shipmentDate = FormatJTokenDate(postingResult["shipment_date"]); |
| | 0 | 653 | | var currencyCode = postingResult["financial_data"]?["currency_code"]?.ToString() ?? "RUB"; |
| | | 654 | | |
| | | 655 | | // Сумма отправления (как в CSV — общая сумма по всем товарам) |
| | 0 | 656 | | decimal totalAmount = 0; |
| | 0 | 657 | | foreach (var p in products) |
| | | 658 | | { |
| | 0 | 659 | | if (decimal.TryParse(p["price"]?.ToString(), |
| | 0 | 660 | | System.Globalization.NumberStyles.Any, |
| | 0 | 661 | | System.Globalization.CultureInfo.InvariantCulture, out var pr) && |
| | 0 | 662 | | int.TryParse(p["quantity"]?.ToString(), out var q)) |
| | | 663 | | { |
| | 0 | 664 | | totalAmount += pr * q; |
| | | 665 | | } |
| | | 666 | | } |
| | 0 | 667 | | var shipmentAmountStr = totalAmount.ToString(System.Globalization.CultureInfo.InvariantCulture); |
| | | 668 | | |
| | | 669 | | // ШАГ 2: Формируем oredersContent в формате CSV-отчёта (по одной строке на product) |
| | 0 | 670 | | var oredersContent = new JArray(); |
| | 0 | 671 | | var articles = new List<string>(); |
| | 0 | 672 | | var ozonIds = new List<string>(); |
| | | 673 | | |
| | 0 | 674 | | foreach (var product in products) |
| | | 675 | | { |
| | 0 | 676 | | var offerId = product["offer_id"]?.ToString() ?? ""; |
| | 0 | 677 | | var sku = product["sku"]?.ToString() ?? ""; |
| | | 678 | | |
| | 0 | 679 | | oredersContent.Add(new JObject |
| | 0 | 680 | | { |
| | 0 | 681 | | ["Номер отправления"] = postingNum, |
| | 0 | 682 | | ["Артикул"] = offerId, |
| | 0 | 683 | | ["Принят в обработку"] = inProcessAt, |
| | 0 | 684 | | ["Дата отгрузки"] = shipmentDate, |
| | 0 | 685 | | ["Статус"] = humanStatus, |
| | 0 | 686 | | ["Сумма отправления"] = shipmentAmountStr, |
| | 0 | 687 | | ["Название товара"] = product["name"]?.ToString() ?? "", |
| | 0 | 688 | | ["Количество"] = product["quantity"]?.ToString() ?? "1", |
| | 0 | 689 | | ["Код валюты отправления"] = currencyCode, |
| | 0 | 690 | | ["SKU"] = sku |
| | 0 | 691 | | }); |
| | | 692 | | |
| | 0 | 693 | | articles.Add(offerId); |
| | 0 | 694 | | ozonIds.Add(sku); |
| | | 695 | | } |
| | | 696 | | |
| | | 697 | | // ШАГ 3: Получаем отчёт по товарам (как в оригинальном BuildData) |
| | | 698 | | // Содержит: Ozon Product ID, SKU, Barcode, Категория, Объём, Вес и т.д. |
| | 0 | 699 | | var productsContent = new JArray(); |
| | | 700 | | try |
| | | 701 | | { |
| | 0 | 702 | | productsContent = await GetProductsContentParallel(articles, ozonIds, batchSize); |
| | 0 | 703 | | } |
| | 0 | 704 | | catch (Exception ex) |
| | | 705 | | { |
| | 0 | 706 | | Console.WriteLine($"BuildDataForPosting: ошибка получения отчёта по товарам: {ex.Message}"); |
| | 0 | 707 | | } |
| | | 708 | | |
| | | 709 | | // Если отчёт по товарам пуст — создаём минимальные записи из данных отправления |
| | 0 | 710 | | if (productsContent == null || !productsContent.Any()) |
| | | 711 | | { |
| | 0 | 712 | | productsContent = new JArray(); |
| | 0 | 713 | | var financialProducts = postingResult["financial_data"]?["products"] as JArray; |
| | 0 | 714 | | for (int i = 0; i < products.Count; i++) |
| | | 715 | | { |
| | 0 | 716 | | var productId = financialProducts != null && i < financialProducts.Count |
| | 0 | 717 | | ? financialProducts[i]?["product_id"]?.ToString() ?? "" |
| | 0 | 718 | | : ""; |
| | 0 | 719 | | productsContent.Add(new JObject |
| | 0 | 720 | | { |
| | 0 | 721 | | ["Артикул"] = products[i]["offer_id"]?.ToString() ?? "", |
| | 0 | 722 | | ["Ozon Product ID"] = productId, |
| | 0 | 723 | | ["SKU"] = products[i]["sku"]?.ToString() ?? "", |
| | 0 | 724 | | ["Barcode"] = "", |
| | 0 | 725 | | ["Категория"] = "", |
| | 0 | 726 | | ["Объем товара, л"] = "", |
| | 0 | 727 | | ["Объемный вес, кг"] = "" |
| | 0 | 728 | | }); |
| | | 729 | | } |
| | | 730 | | } |
| | | 731 | | |
| | 0 | 732 | | NormalizeProductReportArticleColumn(productsContent); |
| | | 733 | | |
| | | 734 | | // Извлекаем данные из отчёта по товарам (как в оригинальном BuildData) |
| | 0 | 735 | | var newArticles = new List<string>(); |
| | 0 | 736 | | var ozonProductIds = new List<string>(); |
| | 0 | 737 | | var fbsOzonSkuIds = new List<string>(); |
| | | 738 | | |
| | 0 | 739 | | foreach (var p in productsContent) |
| | | 740 | | { |
| | 0 | 741 | | newArticles.Add(p["Артикул"]?.ToString() ?? ""); |
| | 0 | 742 | | ozonProductIds.Add(p["Ozon Product ID"]?.ToString() ?? ""); |
| | 0 | 743 | | fbsOzonSkuIds.Add(p["SKU"]?.ToString() ?? ""); |
| | | 744 | | } |
| | | 745 | | |
| | | 746 | | // ШАГ 4: Параллельно получаем цены, склады, картинки (как в оригинальном BuildData) |
| | 0 | 747 | | var pricesTask = GetProductPricesParallel(newArticles, ozonProductIds, batchSize); |
| | 0 | 748 | | var warehousesTask = GetProductWarehousesParallel(fbsOzonSkuIds, batchSize); |
| | 0 | 749 | | var imagesTask = GetProductPrimaryImagesParallel(ozonProductIds, batchSize); |
| | | 750 | | |
| | | 751 | | // Ожидаем цены и склады (при временном сбое цен или складов используем fallback из отправления) |
| | | 752 | | JObject productPrices; |
| | | 753 | | try |
| | | 754 | | { |
| | 0 | 755 | | productPrices = await pricesTask; |
| | 0 | 756 | | } |
| | 0 | 757 | | catch (Exception ex) |
| | | 758 | | { |
| | 0 | 759 | | Console.WriteLine($"BuildDataForPosting: ошибка получения цен ({ex.GetType().Name}): {ex.Message}"); |
| | 0 | 760 | | productPrices = new JObject(); |
| | 0 | 761 | | } |
| | | 762 | | |
| | | 763 | | JObject allProductWarehouses; |
| | | 764 | | try |
| | | 765 | | { |
| | 0 | 766 | | allProductWarehouses = await warehousesTask; |
| | 0 | 767 | | } |
| | 0 | 768 | | catch (Exception ex) |
| | | 769 | | { |
| | 0 | 770 | | Console.WriteLine($"BuildDataForPosting: ошибка получения складов ({ex.GetType().Name}): {ex.Message}"); |
| | 0 | 771 | | allProductWarehouses = new JObject(); |
| | 0 | 772 | | } |
| | | 773 | | |
| | | 774 | | // Картинки — опционально (могут не загрузиться для новых товаров). |
| | | 775 | | // imagesTask всегда наблюдается, чтобы исключить UnobservedTaskException на сборщике мусора. |
| | | 776 | | Dictionary<string, string?> primaryImages; |
| | | 777 | | try |
| | | 778 | | { |
| | 0 | 779 | | primaryImages = await imagesTask; |
| | 0 | 780 | | } |
| | 0 | 781 | | catch |
| | | 782 | | { |
| | 0 | 783 | | primaryImages = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 784 | | } |
| | | 785 | | |
| | | 786 | | // Данные склад+город — ответ /v3/posting/fbs/get (уже получен в шаге 1) |
| | 0 | 787 | | var warehousesAndCitys = new JArray { postingResult.DeepClone() }; |
| | | 788 | | |
| | | 789 | | // ШАГ 5: Собираем данные через тот же CollectData что и оригинальный BuildData |
| | 0 | 790 | | var collectDataResult = new JArray(); |
| | | 791 | | try |
| | | 792 | | { |
| | 0 | 793 | | collectDataResult = await CollectData( |
| | 0 | 794 | | oredersContent, productsContent, productPrices, |
| | 0 | 795 | | allProductWarehouses, warehousesAndCitys, primaryImages); |
| | 0 | 796 | | } |
| | 0 | 797 | | catch (Exception ex) |
| | | 798 | | { |
| | 0 | 799 | | Console.WriteLine($"BuildDataForPosting: ошибка при сборке данных: {ex.Message}"); |
| | 0 | 800 | | } |
| | | 801 | | |
| | | 802 | | // ШАГ 6: Гарантируем что productPricesWithArticle не null (для CalculateСommissions) |
| | 0 | 803 | | foreach (var orderToken in collectDataResult) |
| | | 804 | | { |
| | 0 | 805 | | if (orderToken is not JObject order) |
| | | 806 | | continue; |
| | | 807 | | |
| | 0 | 808 | | if (order["productPricesWithArticle"] == null || |
| | 0 | 809 | | order["productPricesWithArticle"]!.Type == JTokenType.Null) |
| | | 810 | | { |
| | 0 | 811 | | var offerId = order["Артикул"]?.ToString() ?? ""; |
| | 0 | 812 | | var product = products.FirstOrDefault(p => p["offer_id"]?.ToString() == offerId); |
| | 0 | 813 | | var price = product?["price"]?.ToString() ?? "0"; |
| | | 814 | | |
| | 0 | 815 | | order["productPricesWithArticle"] = new JObject |
| | 0 | 816 | | { |
| | 0 | 817 | | ["commissions"] = new JObject |
| | 0 | 818 | | { |
| | 0 | 819 | | ["sales_percent_fbs"] = "0", |
| | 0 | 820 | | ["fbs_deliv_to_customer_amount"] = "0", |
| | 0 | 821 | | ["fbs_first_mile_max_amount"] = "0", |
| | 0 | 822 | | ["fbs_direct_flow_trans_max_amount"] = "0", |
| | 0 | 823 | | ["fbs_first_mile_min_amount"] = "0", |
| | 0 | 824 | | ["fbs_direct_flow_trans_min_amount"] = "0" |
| | 0 | 825 | | }, |
| | 0 | 826 | | ["price"] = new JObject |
| | 0 | 827 | | { |
| | 0 | 828 | | ["marketing_seller_price"] = price, |
| | 0 | 829 | | ["price"] = price |
| | 0 | 830 | | }, |
| | 0 | 831 | | ["acquiring"] = "0" |
| | 0 | 832 | | }; |
| | | 833 | | } |
| | | 834 | | } |
| | | 835 | | |
| | 0 | 836 | | return collectDataResult; |
| | 0 | 837 | | } |
| | | 838 | | |
| | | 839 | | /// <summary> |
| | | 840 | | /// Форматирует JToken-дату в ISO 8601 строку. |
| | | 841 | | /// Newtonsoft.Json автоматически конвертирует строки дат в DateTime при парсинге JSON. |
| | | 842 | | /// При вызове ToString() на таком JValue результат зависит от локали потока, |
| | | 843 | | /// что приводит к ошибкам парсинга в CastToModel (dd.MM ↔ MM.dd). |
| | | 844 | | /// ISO 8601 формат парсится корректно в любой культуре. |
| | | 845 | | /// </summary> |
| | | 846 | | private static string FormatJTokenDate(JToken? token) |
| | | 847 | | { |
| | 0 | 848 | | if (token == null || token.Type == JTokenType.Null) |
| | 0 | 849 | | return ""; |
| | 0 | 850 | | if (token.Type == JTokenType.Date) |
| | 0 | 851 | | return token.Value<DateTime>() |
| | 0 | 852 | | .ToString("yyyy-MM-ddTHH:mm:ssZ", System.Globalization.CultureInfo.InvariantCulture); |
| | 0 | 853 | | return token.ToString(); |
| | | 854 | | } |
| | | 855 | | } |
| | | 856 | | } |