From 56178e9c54cff6670c8169d34e03a895ded7b0f2 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 4 Jun 2016 18:19:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=86=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D1=80=20(=D0=90=D0=A6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/dmitriymx/astralcheckreport/Main.java | 16 ++++++++++++++++ .../astralcheckreport/objects/Product.java | 1 + 2 files changed, 17 insertions(+) diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/Main.java b/src/main/java/ru/dmitriymx/astralcheckreport/Main.java index 2051bf2..4f8a31a 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/Main.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/Main.java @@ -123,6 +123,9 @@ public class Main implements Runnable { else if (data.getTarif().equals("Стартовый, 1 направ.")) { tarif_Start(astral, organization, data); } + else if (data.getTarif().equals("Авторизованный центр (АЦ)")) { + tarif_AuthAC(astral, organization, data); + } else { logger.info("Не задана логика для тарифа: \"{}\"", data.getTarif()); } @@ -366,6 +369,19 @@ public class Main implements Runnable { } } + // Тариф: Авторизованный центр (АЦ) + private void tarif_AuthAC(AstralSession astral, Organization organization, ExcelDataRow data) { + // Step 0: Количество доступных продуктов + if (organization.products.size() == 0) { + logger.warn("({}/{}): Нет доступных продуктов!", organization.inn, organization.kpp); + return; + } + + if (organization.products.get(0).categoryId != 2) { + logger.warn("({}/{}): Неверная категория продукта!", organization.inn, organization.kpp); + } + } + private boolean calcRecipients4(Product product, ExcelDataRow data) { int countFNS = 0, countFSS = 0, diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java b/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java index 1dc8794..c54f822 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java @@ -17,4 +17,5 @@ public class Product { public List recipients; @SerializedName("Accr_represent_id") public String authCenterId; + public int categoryId; }