dev add tariff info and control
Test Workflow / test (push) Has been cancelled

This commit is contained in:
2026-05-27 18:52:46 +07:00
parent 1ac6d6f1b0
commit de2a7f83fd
2 changed files with 6 additions and 7 deletions
@@ -1,6 +1,7 @@
package ru.soune.nocopy.dto.tarriff; package ru.soune.nocopy.dto.tarriff;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@@ -9,36 +10,32 @@ import java.util.List;
@Data @Data
@Builder @Builder
@JsonInclude(JsonInclude.Include.NON_NULL)
public class TariffResponse { public class TariffResponse {
@JsonProperty("tariff_name")
private String tariffName; private String tariffName;
@JsonProperty("type")
private String tariffType; private String tariffType;
@JsonProperty("page") @JsonProperty("page")
@JsonIgnore
private Integer page; private Integer page;
@JsonProperty("page_size") @JsonProperty("page_size")
@JsonIgnore
private Integer pageSize; private Integer pageSize;
@JsonProperty("sort_by") @JsonProperty("sort_by")
@JsonIgnore
private String sortBy; private String sortBy;
@JsonProperty("sort_direction") @JsonProperty("sort_direction")
@JsonIgnore
private String sortDirection; private String sortDirection;
@JsonProperty("total_pages") @JsonProperty("total_pages")
@JsonIgnore
private Integer totalPages; private Integer totalPages;
@JsonProperty("total_elements") @JsonProperty("total_elements")
@JsonIgnore
private Long totalElements; private Long totalElements;
@JsonProperty("tariffs") @JsonProperty("tariffs")
@JsonIgnore
private List<TariffDTO> tariffs; private List<TariffDTO> tariffs;
} }
@@ -10,6 +10,8 @@ import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.tarriff.TariffDTO; import ru.soune.nocopy.dto.tarriff.TariffDTO;
import ru.soune.nocopy.dto.tarriff.TariffRequest; import ru.soune.nocopy.dto.tarriff.TariffRequest;
import ru.soune.nocopy.dto.tarriff.TariffResponse; 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 ru.soune.nocopy.service.tariff.TariffService;
import java.util.List; import java.util.List;