From 72e468e811b4040b50f8fef18dceb6a0ecebc5b3 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 8 Oct 2024 11:48:40 +0300 Subject: [PATCH] =?utf8?q?[ERP-210]=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE?= =?utf8?q?=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BD=D1=8B?= =?utf8?q?=D0=B5=20=D0=B2=20=D1=82=D0=B3=20=D0=B2=D1=85=D0=BE=D0=B4=D1=8F?= =?utf8?q?=D1=82=20=D0=B2=20=D0=B1=D0=BE=D0=BD=D1=83=D1=81=D0=BD=D1=83?= =?utf8?q?=D1=8E=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/core/services/ReportService.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php index 496d88d9..10d00f87 100644 --- a/erp24/api3/core/services/ReportService.php +++ b/erp24/api3/core/services/ReportService.php @@ -145,9 +145,9 @@ class ReportService $sales = Sales::find()->alias('s')->select(["COUNT(*) as cnt", "sum(CASE WHEN operation='Продажа' THEN s.summ ELSE (CASE WHEN operation='Возврат' THEN -s.summ ELSE 0 END) END) as total", - "sum(CASE WHEN s.phone = 0 THEN 0 ELSE 1 END) as bonusUserCount", - "sum(CASE WHEN (s.phone != 0) AND ((u.date_first_sale IS NOT NULL) AND (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') = TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as newBonusUserCount", - "sum(CASE WHEN (s.phone != 0) AND ((u.date_first_sale IS NULL) OR (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') < TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as repeatBonusUserCount", + "sum(CASE WHEN (s.phone != 0) AND (u.telegram_is_subscribed = 1) THEN 1 ELSE 0 END) as bonusUserCount", + "sum(CASE WHEN (s.phone != 0) AND (u.telegram_is_subscribed = 1) AND ((u.date_first_sale IS NOT NULL) AND (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') = TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as newBonusUserCount", + "sum(CASE WHEN (s.phone != 0) AND (u.telegram_is_subscribed = 1) AND ((u.date_first_sale IS NULL) OR (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') < TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as repeatBonusUserCount", "s.store_id", "s.admin_id"]) ->leftJoin('users u', 'u.phone = s.phone::varchar(20) AND u.phone IN (\'' @@ -600,9 +600,9 @@ class ReportService $sales = Sales::find()->alias('s')->select(["COUNT(*) as cnt", "sum(CASE WHEN operation='Продажа' THEN s.summ ELSE (CASE WHEN operation='Возврат' THEN -s.summ ELSE 0 END) END) as total", - "sum(CASE WHEN s.phone = 0 THEN 0 ELSE 1 END) as bonusUserCount", - "sum(CASE WHEN (s.phone != 0) AND ((u.date_first_sale IS NOT NULL) AND (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') = TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as newBonusUserCount", - "sum(CASE WHEN (s.phone != 0) AND ((u.date_first_sale IS NULL) OR (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') < TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as repeatBonusUserCount", + "sum(CASE WHEN (s.phone != 0) AND (u.telegram_is_subscribed = 1) THEN 1 ELSE 0 END) as bonusUserCount", + "sum(CASE WHEN (s.phone != 0) AND (u.telegram_is_subscribed = 1) AND ((u.date_first_sale IS NOT NULL) AND (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') = TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as newBonusUserCount", + "sum(CASE WHEN (s.phone != 0) AND (u.telegram_is_subscribed = 1) AND ((u.date_first_sale IS NULL) OR (TO_CHAR(u.date_first_sale, 'YYYY-MM-DD') < TO_CHAR(s.date, 'YYYY-MM-DD'))) THEN 1 ELSE 0 END) as repeatBonusUserCount", 'store_id_1c', ]) ->leftJoin('users u', 'u.phone = s.phone::varchar(20) AND u.phone IN (\'' -- 2.39.5