From: Alexander Smirnov Date: Mon, 15 Jul 2024 13:55:52 +0000 (+0300) Subject: Прекращаем дарить 20% бонусов просто так X-Git-Tag: 1.4~79^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=92d01f4576613bf7f86414abdd16b72bb9efffe6;p=erp24_rep%2Fyii-erp24%2F.git Прекращаем дарить 20% бонусов просто так --- diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php index b7dcf12c..ee5d5233 100644 --- a/erp24/api2/controllers/BonusController.php +++ b/erp24/api2/controllers/BonusController.php @@ -113,7 +113,7 @@ class BonusController extends BaseController $userFound = Users::find()->where(['phone' => $result['phone']])->one(); file_put_contents(self::OUT_DIR . '/get_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND); /** @var $userFound Users */ - $salesCount = 0; + $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */ if ($userFound && $userFound->telegram_created_at) { $salesCount = intval(Sales::find()->where(['phone' => $result['phone'], 'operation' => Sales::OPERATION_SALE]) ->andWhere(['>=', 'date', $userFound->telegram_created_at])->count()); @@ -780,7 +780,7 @@ class BonusController extends BaseController file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND); $userFound = Users::find()->where(['phone' => $result['phone']])->one(); /** @var $userFound Users */ - $salesCount = 0; + $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */ file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND); if ($userFound && $userFound->telegram_created_at) { diff --git a/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php b/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php index b27f32d3..2296078f 100644 --- a/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php +++ b/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php @@ -94,7 +94,7 @@ try { $userFound = Users::find()->where(['phone' => $phone])->one(); /** @var $userFound Users */ - $salesCount = 0; + $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */ if ($userFound && $userFound->telegram_created_at) { $salesCount = intval(Sales::find()->where(['phone' => $phone, 'operation' => Sales::OPERATION_SALE]) ->andWhere(['>=', 'date', $userFound->telegram_created_at])->count()); diff --git a/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php b/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php index 7b912189..b63f51f7 100644 --- a/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php +++ b/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php @@ -96,7 +96,7 @@ try { $userFound = Users::find()->where(['phone' => $phone])->one(); /** @var $userFound Users */ - $salesCount = 0; + $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */ if ($userFound && $userFound->telegram_created_at) { $salesCount = intval(Sales::find()->where(['phone' => $phone, 'operation' => Sales::OPERATION_SALE]) ->andWhere(['>=', 'date', $userFound->telegram_created_at])->count());