treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-1011

Browse source
This commit is contained in:
etreschenkov 2026-05-14 11:23:47 +03:00
parent 85aac6a569
commit 0a659ead33
4 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java
View file

@ -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;
}

2
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -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 'Дата расчетов';

7
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.25.sql Normal file
View file

@ -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;

3
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OrderCurrencyMapStore.java
View file

@ -50,6 +50,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
"QUANTITY_LOT",
"QUANTITY",
"LOT_SIZE",
"BASE_PRICE",
"SIDE",
"SETTLE_CODE",
"SETTLE_DATE",
@ -104,6 +105,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
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<OrderCurrency> {
object.getQuantityLot(),
object.getQuantity(),
object.getLotSize(),
object.getBasePrice(),
object.getSide(),
object.getSettleCode(),
TimeUtil.toDateFromLocalDate(object.getSettleDate()),