From 6430a3ef4d95fe77a05cacd378f0889c66048f58 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 2 Jun 2026 11:04:20 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1046 --- .../component/validation/QuantityLotGreaterThanZero.java | 4 ++-- .../clearing/dflt/management/config/ValidationConfig.java | 1 + .../domain/cud/order/OrderCurrencyUpdateRequest.java | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/QuantityLotGreaterThanZero.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/QuantityLotGreaterThanZero.java index af9099f09..05d12433d 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/QuantityLotGreaterThanZero.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/component/validation/QuantityLotGreaterThanZero.java @@ -13,8 +13,8 @@ public class QuantityLotGreaterThanZero implements IV @Override public Optional validate(ImdgValidationContext ctx) { T validatedObject = ctx.getValidatedObject(); - if (validatedObject.getQuantityLot() == null || validatedObject.getQuantityLot() < 0) { - return of(DefaultManagementErrors.RequiredFieldIsEmpty, "quantityLot"); + if (validatedObject.getQuantityLot() == null || validatedObject.getQuantityLot() <= 0) { + return of(DefaultManagementErrors.OperationNotAllowed, "quantityLot"); } return Optional.empty(); } diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java index 5ea5e96d8..09549f08d 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java @@ -242,6 +242,7 @@ public class ValidationConfig { return new ValidatorImpl<>(ctx, orderCurrencyPresentById, securityPresent, + QuantityLotGreaterThanZero.INSTANCE, DictionaryPresentRule.instance( "side", OrderCurrencyUpdateRequest::getSide, diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCurrencyUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCurrencyUpdateRequest.java index ba0a5c99e..b7ac8015a 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCurrencyUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/order/OrderCurrencyUpdateRequest.java @@ -1,10 +1,11 @@ package ru.spcex.clearing.platform.messaging.domain.cud.order; -import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; +import java.math.BigDecimal; import ru.spcex.platform.classes.base.interfaces.WithId; +import ru.spcex.platform.classes.base.interfaces.WithQuantityLot; -public class OrderCurrencyUpdateRequest implements WithId { +public class OrderCurrencyUpdateRequest implements WithId, WithQuantityLot { @JsonProperty private Long id; @JsonProperty @@ -56,6 +57,7 @@ public class OrderCurrencyUpdateRequest implements WithId { this.price = price; } + @Override public Long getQuantityLot() { return quantityLot; }