backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev add tarriff description
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-05-15 16:06:31 +07:00
parent cbff850da6
commit df38da6d5f
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/tariff/TariffService.java
+27 -11
View File
@@ -114,17 +114,33 @@ public class TariffService {
}
private Tariff updateTariffFromDTO(Tariff tariff, TariffDTO dto, TariffRequest tariffRequest) {
tariff.setType(tariffRequest.getType() == null ? dto.getType(): tariffRequest.getType());
tariff.setName(tariffRequest.getName() == null ? dto.getName(): tariffRequest.getName());
tariff.setPrice(tariffRequest.getPrice() == 0 ? dto.getPrice(): tariffRequest.getPrice());
tariff.setTokens(tariffRequest.getTokens() == 0 ? dto.getTokens(): tariffRequest.getTokens());
tariff.setMaxFilesCount(tariffRequest.getMaxFilesCount() == 0 ? dto.getMaxFilesCount():
tariffRequest.getMaxFilesCount());
tariff.setDiskSize(tariffRequest.getDiskSize() == 0 ? dto.getDiskSize(): tariffRequest.getDiskSize());
tariff.setMaxUsers(tariffRequest.getMaxUsers() == 0 ? dto.getMaxUsers(): tariffRequest.getMaxUsers());
tariff.setDescription(tariffRequest.getDescription() == null ? dto.getDescription(): tariffRequest.getDescription());
tariff.setTariffTerm(tariffRequest.getTariffTerm() == null ? TariffTimeTerm.valueOf(dto.getTariffTerm().toUpperCase()):
TariffTimeTerm.valueOf(tariffRequest.getTariffTerm()));
if (tariffRequest.getType() != null) {
tariff.setType(tariffRequest.getType());
}
if (tariffRequest.getName() != null) {
tariff.setName(tariffRequest.getName());
}
if (tariffRequest.getPrice() != null) { // null = не обновляем
tariff.setPrice(tariffRequest.getPrice());
}
if (tariffRequest.getTokens() != null) {
tariff.setTokens(tariffRequest.getTokens());
}
if (tariffRequest.getMaxFilesCount() != null) {
tariff.setMaxFilesCount(tariffRequest.getMaxFilesCount());
}
if (tariffRequest.getDiskSize() != null) {
tariff.setDiskSize(tariffRequest.getDiskSize());
}
if (tariffRequest.getMaxUsers() != null) {
tariff.setMaxUsers(tariffRequest.getMaxUsers());
}
if (tariffRequest.getDescription() != null) {
tariff.setDescription(tariffRequest.getDescription());
}
if (tariffRequest.getTariffTerm() != null) {
tariff.setTariffTerm(TariffTimeTerm.valueOf(tariffRequest.getTariffTerm()));
}
return tariff;
}