Переписывание запроса памятного события

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index f925b2d2f43b97654a2aacf4eb387502aed939e0..9fb1d70848d488e1eb4a3e61ca5f2f77829957e8 100755 (executable)
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -595,6 +595,11 @@ class Users extends \yii\db\ActiveRecord
             }, $phones);
         }
 
+        $targetDate = SentKogort::find()
+            ->where(['kogort_date' => $startDate, 'kogort_number' => SentKogort::KOGORT_NUMBERS[$type]])
+            ->select(['target_date'])
+            ->one();
+
         $salesData = Sales::find()
             ->select([
                 'phone',
@@ -611,7 +616,9 @@ class Users extends \yii\db\ActiveRecord
         $memorableDates = UsersEvents::find()
             ->select(['phone'])
             ->where(['phone' => $phones])
-            ->distinct()
+            ->andWhere(['date_month' => (int)date('m', strtotime($targetDate['target_date'])),
+                'date_day' => (int)date('d', strtotime($targetDate['target_date']))])
+            ->distinct('phone')
             ->asArray()
             ->indexBy('phone')
             ->all();