From: fomichev Date: Tue, 10 Jun 2025 15:35:46 +0000 (+0300) Subject: Рефакторинг цен X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f931691184812a5e3edee7903ce07442a9430d61;p=erp24_rep%2Fyii-erp24%2F.git Рефакторинг цен --- diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php index 23e6fdbd..2bfec0d8 100644 --- a/erp24/controllers/AutoPlannogrammaController.php +++ b/erp24/controllers/AutoPlannogrammaController.php @@ -866,35 +866,7 @@ class AutoPlannogrammaController extends BaseController // Обработка даты на год и месяц if (!empty($filters['year']) && !empty($filters['month'])) { $filters['plan_date'] = $filters['year'] . '-' . str_pad($filters['month'], 2, '0', STR_PAD_LEFT) . '-01'; - $periodEnd = (new \DateTime())->format('Y-m-d H:i:s'); // «сейчас» - $periodStart = (new \DateTime())->modify('-20 days')->format('Y-m-d H:i:s'); // «сейчас – 2 дня» - - $prices = PricesDynamic::find() - - ->where(['product_id' => ['2b5a5fcd-03d4-11ef-84e6-ac1f6b1b7573', '2b72702a-792f-11e8-9edd-1c6f659fb563']]) - - ->andWhere(['<=', 'date_from', $periodEnd]) - ->andWhere(['>=', 'date_to', $periodStart]) - ->orderBy(['date_from' => SORT_ASC]) - ->asArray() - ->all(); - - $pricesMap = []; - foreach ($prices as $price) { - if ($price['product_id'] == '2b72702a-792f-11e8-9edd-1c6f659fb563') { - if ( empty($pricesMap[$price['product_id']][$price['region_id']])) { - $pricesMap[$price['product_id']][$price['region_id']][] = $price['price']; - } else { - $pricesMap[$price['product_id']][$price['region_id']][0] = min($price['price'], $pricesMap[$price['product_id']][$price['region_id']][0]); - } - } else { - if ($price['active'] !== 1) { - continue; - } - $pricesMap[$price['product_id']][$price['region_id']][] = $price['price']; - } - } - var_dump($prices);die(); + $service = new AutoPlannogrammaService(); //$goals = $service->calculateFullGoalChain($filters);