diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java index cf5b6bc3c..15d024d65 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java @@ -23,6 +23,7 @@ public class OrderCurrency extends BusinessObject { private BigDecimal quantityLot; private BigDecimal quantity; private BigDecimal lotSize; + private BigDecimal basePrice; private String side; private String settleCode; private LocalDate settleDate; @@ -163,6 +164,14 @@ public class OrderCurrency extends BusinessObject { return lotSize; } + public BigDecimal getBasePrice() { + return basePrice; + } + + public void setBasePrice(BigDecimal basePrice) { + this.basePrice = basePrice; + } + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; } diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 74a2917c3..63f09b115 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -5576,6 +5576,7 @@ CREATE TABLE ORDER_CURRENCY QUANTITY_LOT NUMERIC(72,2), QUANTITY NUMERIC(72,2), LOT_SIZE NUMERIC(72,2), + BASE_PRICE NUMERIC(72,2), SIDE VARCHAR(4), SETTLE_CODE VARCHAR(4), SETTLE_DATE DATE, @@ -5606,6 +5607,7 @@ COMMENT ON COLUMN ORDER_CURRENCY.RATE is 'Ставка переноса'; COMMENT ON COLUMN ORDER_CURRENCY.QUANTITY_LOT is 'Количество лотов'; COMMENT ON COLUMN ORDER_CURRENCY.QUANTITY is 'Количество лотов в шт.'; COMMENT ON COLUMN ORDER_CURRENCY.LOT_SIZE is 'Размер лота'; +COMMENT ON COLUMN ORDER_CURRENCY.BASE_PRICE IS 'Базовый курс'; COMMENT ON COLUMN ORDER_CURRENCY.SIDE is 'Направление заявки'; COMMENT ON COLUMN ORDER_CURRENCY.SETTLE_CODE is 'Код расчетов'; COMMENT ON COLUMN ORDER_CURRENCY.SETTLE_DATE is 'Дата расчетов'; diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.25.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.25.sql new file mode 100644 index 000000000..44b4ad511 --- /dev/null +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.25.sql @@ -0,0 +1,7 @@ +-- DB version: 3.24 -> 3.25 + + +ALTER TABLE ORDER_CURRENCY ADD COLUMN IF NOT EXISTS BASE_PRICE NUMERIC(72, 18); +COMMENT ON COLUMN ORDER_CURRENCY.BASE_PRICE IS 'Базовый курс'; + +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.25') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION; \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OrderCurrencyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OrderCurrencyMapStore.java index 205db8df6..70f3745b0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OrderCurrencyMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OrderCurrencyMapStore.java @@ -50,6 +50,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore { "QUANTITY_LOT", "QUANTITY", "LOT_SIZE", + "BASE_PRICE", "SIDE", "SETTLE_CODE", "SETTLE_DATE", @@ -104,6 +105,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore { object.setQuantityLot(resultSet.getBigDecimal("QUANTITY_LOT")); object.setQuantity(resultSet.getBigDecimal("QUANTITY")); object.setLotSize(resultSet.getBigDecimal("LOT_SIZE")); + object.setBasePrice(resultSet.getBigDecimal("BASE_PRICE")); object.setSide(resultSet.getString("SIDE")); object.setSettleCode(resultSet.getString("SETTLE_CODE")); object.setSettleDate(getLocalDateFromSqlDate(resultSet, "SETTLE_DATE")); @@ -136,6 +138,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore { object.getQuantityLot(), object.getQuantity(), object.getLotSize(), + object.getBasePrice(), object.getSide(), object.getSettleCode(), TimeUtil.toDateFromLocalDate(object.getSettleDate()),