From de2a7f83fd970b9e3678938a9f5484a0673d8cc3 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Wed, 27 May 2026 18:52:46 +0700 Subject: [PATCH] dev add tariff info and control --- .../ru/soune/nocopy/dto/tarriff/TariffResponse.java | 11 ++++------- .../ru/soune/nocopy/handler/TariffControlHandler.java | 2 ++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/dto/tarriff/TariffResponse.java b/src/main/java/ru/soune/nocopy/dto/tarriff/TariffResponse.java index 07331fb..71d1e01 100644 --- a/src/main/java/ru/soune/nocopy/dto/tarriff/TariffResponse.java +++ b/src/main/java/ru/soune/nocopy/dto/tarriff/TariffResponse.java @@ -1,6 +1,7 @@ package ru.soune.nocopy.dto.tarriff; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.Data; @@ -9,36 +10,32 @@ import java.util.List; @Data @Builder +@JsonInclude(JsonInclude.Include.NON_NULL) public class TariffResponse { + @JsonProperty("tariff_name") private String tariffName; + @JsonProperty("type") private String tariffType; @JsonProperty("page") - @JsonIgnore private Integer page; @JsonProperty("page_size") - @JsonIgnore private Integer pageSize; @JsonProperty("sort_by") - @JsonIgnore private String sortBy; @JsonProperty("sort_direction") - @JsonIgnore private String sortDirection; @JsonProperty("total_pages") - @JsonIgnore private Integer totalPages; @JsonProperty("total_elements") - @JsonIgnore private Long totalElements; @JsonProperty("tariffs") - @JsonIgnore private List tariffs; } diff --git a/src/main/java/ru/soune/nocopy/handler/TariffControlHandler.java b/src/main/java/ru/soune/nocopy/handler/TariffControlHandler.java index 76aef20..00bcd81 100644 --- a/src/main/java/ru/soune/nocopy/handler/TariffControlHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/TariffControlHandler.java @@ -10,6 +10,8 @@ import ru.soune.nocopy.dto.MessageCode; import ru.soune.nocopy.dto.tarriff.TariffDTO; import ru.soune.nocopy.dto.tarriff.TariffRequest; import ru.soune.nocopy.dto.tarriff.TariffResponse; +import ru.soune.nocopy.entity.tarif.Tariff; +import ru.soune.nocopy.entity.tarif.TariffTimeTerm; import ru.soune.nocopy.service.tariff.TariffService; import java.util.List;